diff options
| author | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2014-02-20 13:16:05 +0100 |
|---|---|---|
| committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2014-02-20 13:16:05 +0100 |
| commit | 3e11350255d9c5d4bd03c2a65769da84c05d3294 (patch) | |
| tree | 2ebc3d0fa0592479020d2d9dc7228b4d15ed2eaa /include/configs/M54418TWR.h | |
| parent | e7538fee991308c16f76f7eca2517089f2a30ff4 (diff) | |
| parent | 0a8e823ad0c5a602c93c2e8a54caf622ade6d3fb (diff) | |
| download | u-boot-imx-3e11350255d9c5d4bd03c2a65769da84c05d3294.zip u-boot-imx-3e11350255d9c5d4bd03c2a65769da84c05d3294.tar.gz u-boot-imx-3e11350255d9c5d4bd03c2a65769da84c05d3294.tar.bz2 | |
Merge branch 'u-boot/master' into 'u-boot-arm/master'
Conflicts:
Makefile
drivers/net/npe/Makefile
These two conflicts arise from commit 0b2d3f20
("ARM: NET: Remove the IXP NPE ethernet driver") and are
resolved by deleting the drivers/net/npe/Makefile file
and removing the CONFIG_IXP4XX_NPE line from Makefile.
Diffstat (limited to 'include/configs/M54418TWR.h')
| -rw-r--r-- | include/configs/M54418TWR.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/include/configs/M54418TWR.h b/include/configs/M54418TWR.h index de063b7..3d7dc1f 100644 --- a/include/configs/M54418TWR.h +++ b/include/configs/M54418TWR.h @@ -77,7 +77,6 @@ #define CONFIG_SYS_MAX_NAND_DEVICE 1 #define NAND_MAX_CHIPS CONFIG_SYS_MAX_NAND_DEVICE #define CONFIG_SYS_NAND_SELECT_DEVICE -#define CONFIG_SYS_64BIT_VSPRINTF /* needed for nand_util.c */ #endif /* Network configuration */ @@ -268,10 +267,8 @@ /* End of used area in internal SRAM */ #define CONFIG_SYS_INIT_RAM_SIZE 0x10000 #define CONFIG_SYS_INIT_RAM_CTRL 0x221 -/* size in bytes reserved for initial data */ -#define CONFIG_SYS_GBL_DATA_SIZE 256 #define CONFIG_SYS_GBL_DATA_OFFSET ((CONFIG_SYS_INIT_RAM_SIZE - \ - CONFIG_SYS_GBL_DATA_SIZE) - 32) + GENERATED_GBL_DATA_SIZE) - 32) #define CONFIG_SYS_INIT_SP_OFFSET CONFIG_SYS_GBL_DATA_OFFSET #define CONFIG_SYS_SBFHDR_DATA_OFFSET (CONFIG_SYS_INIT_RAM_SIZE - 32) |