mirror of
https://github.com/brain-hackers/u-boot-brain
synced 2024-06-09 23:36:03 +09:00
67c31036ac
With recent toolchains, the environment sectors were no longer aligned to sector boundaries. The reason was a combination of two bugs: 1) common/environment.c assumed that CONFIG_TQM8xxL would be defined for all TQM8xxL and TQM8xxM boards. But "include/common.h", where this gets defined, is not included here (and cannot be included without causing lots of problems). Added a new #define CFG_USE_PPCENV for all boards which really want to put the environment is a ".ppcenv" section. 2) The linker scripts just include environment.o, silently assuming that the objects in that file are really in the order in which they are coded in the C file, i. e. "environment" first, then "redundand_environment", and "env_size" last. However, current toolchains (GCC-4.x) reorder the objects, causing the environment data not to start on a flash sector boundary: Instead of: we got: 40008000 T environment 40008000 T env_size 4000c000 T redundand_environment 40008004 T redundand_environment 40010000 T env_size 4000c004 T environment Note: this patch fixes just the first part, and cures the alignment problem by making sure that "env_size" gets placed correctly. However, we still have a potential issue because primary and redundant environment sectors are actually swapped, i. e. we have now: 40008000 T redundand_environment 4000c000 T environment 40010000 T env_size This shall be fixed in the next version. Signed-off-by: Wolfgang Denk <wd@denx.de>
204 lines
5.3 KiB
C
204 lines
5.3 KiB
C
/*
|
|
* (C) Copyright 2001
|
|
* Erik Theisen, Wave 7 Optics, etheisen@mindspring.com.
|
|
*
|
|
* See file CREDITS for list of people who contributed to this
|
|
* project.
|
|
*
|
|
* This program is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU General Public License as
|
|
* published by the Free Software Foundation; either version 2 of
|
|
* the License, or (at your option) any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program; if not, write to the Free Software
|
|
* Foundation, Inc., 59 Temple Place, Suite 330, Boston,
|
|
* MA 02111-1307 USA
|
|
*/
|
|
|
|
#ifndef __ASSEMBLY__
|
|
#define __ASSEMBLY__ /* Dirty trick to get only #defines */
|
|
#endif
|
|
#define __ASM_STUB_PROCESSOR_H__ /* don't include asm/processor. */
|
|
#include <config.h>
|
|
#undef __ASSEMBLY__
|
|
#include <environment.h>
|
|
|
|
/*
|
|
* Handle HOSTS that have prepended
|
|
* crap on symbol names, not TARGETS.
|
|
*/
|
|
#if defined(__APPLE__)
|
|
/* Leading underscore on symbols */
|
|
# define SYM_CHAR "_"
|
|
#else /* No leading character on symbols */
|
|
# define SYM_CHAR
|
|
#endif
|
|
|
|
/*
|
|
* Generate embedded environment table
|
|
* inside U-Boot image, if needed.
|
|
*/
|
|
#if defined(ENV_IS_EMBEDDED)
|
|
/*
|
|
* Only put the environment in it's own section when we are building
|
|
* U-Boot proper. The host based program "tools/envcrc" does not need
|
|
* a seperate section. Note that ENV_CRC is only defined when building
|
|
* U-Boot itself.
|
|
*/
|
|
#if (defined(CFG_USE_PPCENV) || defined(CONFIG_NAND_U_BOOT)) && \
|
|
defined(ENV_CRC) /* Environment embedded in U-Boot .ppcenv section */
|
|
/* XXX - This only works with GNU C */
|
|
# define __PPCENV__ __attribute__ ((section(".ppcenv")))
|
|
# define __PPCTEXT__ __attribute__ ((section(".text")))
|
|
|
|
#elif defined(USE_HOSTCC) /* Native for 'tools/envcrc' */
|
|
# define __PPCENV__ /*XXX DO_NOT_DEL_THIS_COMMENT*/
|
|
# define __PPCTEXT__ /*XXX DO_NOT_DEL_THIS_COMMENT*/
|
|
|
|
#else /* Environment is embedded in U-Boot's .text section */
|
|
/* XXX - This only works with GNU C */
|
|
# define __PPCENV__ __attribute__ ((section(".text")))
|
|
# define __PPCTEXT__ __attribute__ ((section(".text")))
|
|
#endif
|
|
|
|
/*
|
|
* Macros to generate global absolutes.
|
|
*/
|
|
#define GEN_SYMNAME(str) SYM_CHAR #str
|
|
#define GEN_VALUE(str) #str
|
|
#define GEN_ABS(name, value) \
|
|
asm (".globl " GEN_SYMNAME(name)); \
|
|
asm (GEN_SYMNAME(name) " = " GEN_VALUE(value))
|
|
|
|
/*
|
|
* Macros to transform values
|
|
* into environment strings.
|
|
*/
|
|
#define XMK_STR(x) #x
|
|
#define MK_STR(x) XMK_STR(x)
|
|
|
|
/*
|
|
* Check to see if we are building with a
|
|
* computed CRC. Otherwise define it as ~0.
|
|
*/
|
|
#if !defined(ENV_CRC)
|
|
# define ENV_CRC ~0
|
|
#endif
|
|
|
|
env_t environment __PPCENV__ = {
|
|
ENV_CRC, /* CRC Sum */
|
|
#ifdef CFG_REDUNDAND_ENVIRONMENT
|
|
1, /* Flags: valid */
|
|
#endif
|
|
{
|
|
#if defined(CONFIG_BOOTARGS)
|
|
"bootargs=" CONFIG_BOOTARGS "\0"
|
|
#endif
|
|
#if defined(CONFIG_BOOTCOMMAND)
|
|
"bootcmd=" CONFIG_BOOTCOMMAND "\0"
|
|
#endif
|
|
#if defined(CONFIG_RAMBOOTCOMMAND)
|
|
"ramboot=" CONFIG_RAMBOOTCOMMAND "\0"
|
|
#endif
|
|
#if defined(CONFIG_NFSBOOTCOMMAND)
|
|
"nfsboot=" CONFIG_NFSBOOTCOMMAND "\0"
|
|
#endif
|
|
#if defined(CONFIG_BOOTDELAY) && (CONFIG_BOOTDELAY >= 0)
|
|
"bootdelay=" MK_STR(CONFIG_BOOTDELAY) "\0"
|
|
#endif
|
|
#if defined(CONFIG_BAUDRATE) && (CONFIG_BAUDRATE >= 0)
|
|
"baudrate=" MK_STR(CONFIG_BAUDRATE) "\0"
|
|
#endif
|
|
#ifdef CONFIG_LOADS_ECHO
|
|
"loads_echo=" MK_STR(CONFIG_LOADS_ECHO) "\0"
|
|
#endif
|
|
#ifdef CONFIG_ETHADDR
|
|
"ethaddr=" MK_STR(CONFIG_ETHADDR) "\0"
|
|
#endif
|
|
#ifdef CONFIG_ETH1ADDR
|
|
"eth1addr=" MK_STR(CONFIG_ETH1ADDR) "\0"
|
|
#endif
|
|
#ifdef CONFIG_ETH2ADDR
|
|
"eth2addr=" MK_STR(CONFIG_ETH2ADDR) "\0"
|
|
#endif
|
|
#ifdef CONFIG_ETH3ADDR
|
|
"eth3addr=" MK_STR(CONFIG_ETH3ADDR) "\0"
|
|
#endif
|
|
#ifdef CONFIG_ETHPRIME
|
|
"ethprime=" CONFIG_ETHPRIME "\0"
|
|
#endif
|
|
#ifdef CONFIG_IPADDR
|
|
"ipaddr=" MK_STR(CONFIG_IPADDR) "\0"
|
|
#endif
|
|
#ifdef CONFIG_SERVERIP
|
|
"serverip=" MK_STR(CONFIG_SERVERIP) "\0"
|
|
#endif
|
|
#ifdef CFG_AUTOLOAD
|
|
"autoload=" CFG_AUTOLOAD "\0"
|
|
#endif
|
|
#ifdef CONFIG_ROOTPATH
|
|
"rootpath=" MK_STR(CONFIG_ROOTPATH) "\0"
|
|
#endif
|
|
#ifdef CONFIG_GATEWAYIP
|
|
"gatewayip=" MK_STR(CONFIG_GATEWAYIP) "\0"
|
|
#endif
|
|
#ifdef CONFIG_NETMASK
|
|
"netmask=" MK_STR(CONFIG_NETMASK) "\0"
|
|
#endif
|
|
#ifdef CONFIG_HOSTNAME
|
|
"hostname=" MK_STR(CONFIG_HOSTNAME) "\0"
|
|
#endif
|
|
#ifdef CONFIG_BOOTFILE
|
|
"bootfile=" MK_STR(CONFIG_BOOTFILE) "\0"
|
|
#endif
|
|
#ifdef CONFIG_LOADADDR
|
|
"loadaddr=" MK_STR(CONFIG_LOADADDR) "\0"
|
|
#endif
|
|
#ifdef CONFIG_PREBOOT
|
|
"preboot=" CONFIG_PREBOOT "\0"
|
|
#endif
|
|
#ifdef CONFIG_CLOCKS_IN_MHZ
|
|
"clocks_in_mhz=" "1" "\0"
|
|
#endif
|
|
#if defined(CONFIG_PCI_BOOTDELAY) && (CONFIG_PCI_BOOTDELAY > 0)
|
|
"pcidelay=" MK_STR(CONFIG_PCI_BOOTDELAY) "\0"
|
|
#endif
|
|
#ifdef CONFIG_EXTRA_ENV_SETTINGS
|
|
CONFIG_EXTRA_ENV_SETTINGS
|
|
#endif
|
|
"\0" /* Term. env_t.data with 2 NULs */
|
|
}
|
|
};
|
|
#ifdef CFG_ENV_ADDR_REDUND
|
|
env_t redundand_environment __PPCENV__ = {
|
|
0, /* CRC Sum: invalid */
|
|
0, /* Flags: invalid */
|
|
{
|
|
"\0"
|
|
}
|
|
};
|
|
#endif /* CFG_ENV_ADDR_REDUND */
|
|
|
|
/*
|
|
* These will end up in the .text section
|
|
* if the environment strings are embedded
|
|
* in the image. When this is used for
|
|
* tools/envcrc, they are placed in the
|
|
* .data/.sdata section.
|
|
*
|
|
*/
|
|
unsigned long env_size __PPCTEXT__ = sizeof(env_t);
|
|
|
|
/*
|
|
* Add in absolutes.
|
|
*/
|
|
GEN_ABS(env_offset, CFG_ENV_OFFSET);
|
|
|
|
#endif /* ENV_IS_EMBEDDED */
|