diff options
| author | Tom Rini <trini@konsulko.com> | 2015-11-06 09:21:33 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2015-11-06 09:21:33 -0500 |
| commit | 4ca0c3c993436cca743ed521e7f3d784d7fe31c8 (patch) | |
| tree | 4a14903a7134569b12206d439603d9db04647af7 /include | |
| parent | 250ea267d875ce3ff0e046308d31f51ff8d3b5e8 (diff) | |
| parent | 75199d6f722a0f711628194240ee5bf724e31101 (diff) | |
| download | u-boot-4ca0c3c993436cca743ed521e7f3d784d7fe31c8.tar.gz u-boot-4ca0c3c993436cca743ed521e7f3d784d7fe31c8.tar.bz2 u-boot-4ca0c3c993436cca743ed521e7f3d784d7fe31c8.zip | |
Merge branch 'master' of git://git.denx.de/u-boot-nios
Diffstat (limited to 'include')
| -rw-r--r-- | include/configs/nios2-generic.h | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/include/configs/nios2-generic.h b/include/configs/nios2-generic.h index b38513e99b..dbd39d6a58 100644 --- a/include/configs/nios2-generic.h +++ b/include/configs/nios2-generic.h @@ -36,10 +36,10 @@ /* * MII/PHY */ -#define CONFIG_CMD_MII 1 -#define CONFIG_PHY_GIGE 1 -#define CONFIG_SYS_FAULT_ECHO_LINK_DOWN 1 -#define CONFIG_PHY_MARVELL 1 +#define CONFIG_CMD_MII +#define CONFIG_PHY_GIGE +#define CONFIG_SYS_FAULT_ECHO_LINK_DOWN +#define CONFIG_PHY_MARVELL /* * BOOTP options @@ -77,15 +77,13 @@ */ #define CONFIG_SYS_SDRAM_BASE 0xD0000000 #define CONFIG_SYS_SDRAM_SIZE 0x08000000 +#define CONFIG_NR_DRAM_BANKS 1 #define CONFIG_MONITOR_IS_IN_RAM #define CONFIG_SYS_MONITOR_LEN 0x40000 /* Reserve 256k */ #define CONFIG_SYS_MONITOR_BASE (CONFIG_SYS_SDRAM_BASE + \ CONFIG_SYS_SDRAM_SIZE - \ CONFIG_SYS_MONITOR_LEN) -#define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + 0x20000) -#define CONFIG_SYS_MALLOC_BASE (CONFIG_SYS_MONITOR_BASE - \ - CONFIG_SYS_MALLOC_LEN) -#define CONFIG_SYS_INIT_SP CONFIG_SYS_MALLOC_BASE +#define CONFIG_SYS_MALLOC_LEN 0x20000 /* * MISC @@ -99,7 +97,10 @@ 16) /* Print buf size */ #define CONFIG_SYS_LOAD_ADDR CONFIG_SYS_SDRAM_BASE #define CONFIG_SYS_MEMTEST_START CONFIG_SYS_SDRAM_BASE -#define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_INIT_SP - 0x20000) +#define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_MONITOR_BASE - \ + CONFIG_ENV_SIZE - \ + CONFIG_SYS_MALLOC_LEN - \ + 0x10000) #define CONFIG_CMDLINE_EDITING #define CONFIG_CMD_GPIO |