X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=include%2Fconfigs%2Fa3m071.h;h=8f17dd18c7ac38cf7edc59e320fa6af9bc95dcca;hb=2ae9fbe00f71b8e48a04a13a71a9f6b42b70f158;hp=f8cea62b5962fc76b65fd20fe318602a9f9af41b;hpb=4d80051b63ff54f6b6f90fceb92cf87ab3401ecb;p=u-boot diff --git a/include/configs/a3m071.h b/include/configs/a3m071.h index f8cea62b59..8f17dd18c7 100644 --- a/include/configs/a3m071.h +++ b/include/configs/a3m071.h @@ -15,7 +15,6 @@ #define CONFIG_MPC5200 #define CONFIG_A3M071 /* A3M071 board */ #define CONFIG_DISPLAY_BOARDINFO -#define CONFIG_SYS_GENERIC_BOARD #define CONFIG_SYS_TEXT_BASE 0x01000000 /* boot low for 32 MiB boards */ @@ -45,13 +44,8 @@ /* * Command line configuration. */ -#include - #define CONFIG_CMD_BSP -#define CONFIG_CMD_CACHE -#define CONFIG_CMD_MII #define CONFIG_CMD_REGINFO -#define CONFIG_CMD_DHCP #define CONFIG_BOOTP_SEND_HOSTNAME #define CONFIG_BOOTP_SERVERIP #define CONFIG_BOOTP_MAY_FAIL @@ -59,10 +53,8 @@ #define CONFIG_BOOTP_GATEWAY #define CONFIG_BOOTP_SERVERIP #define CONFIG_NET_RETRY_COUNT 3 -#define CONFIG_CMD_LINK_LOCAL #define CONFIG_NETCONSOLE #define CONFIG_SYS_CONSOLE_IS_IN_ENV -#define CONFIG_CMD_PING #define CONFIG_MTD_DEVICE /* needed for mtdparts commands */ #define CONFIG_MTD_PARTITIONS /* needed for UBI */ #define CONFIG_FLASH_CFI_MTD @@ -85,7 +77,6 @@ #define CONFIG_CMD_MTDPARTS #define CONFIG_CMD_UBI #define CONFIG_CMD_UBIFS -#define CONFIG_FIT /* * IPB Bus clocking configuration. @@ -98,10 +89,6 @@ #undef CONFIG_SYS_PCICLK_EQUALS_IPBCLK_DIV2 #endif -/* pass open firmware flat tree */ -#define CONFIG_OF_LIBFDT -#define CONFIG_OF_BOARD_SETUP - /* maximum size of the flat tree (8K) */ #define OF_FLAT_TREE_MAX_SIZE 8192 @@ -149,9 +136,9 @@ /* Use SRAM until RAM will be available */ #define CONFIG_SYS_INIT_RAM_ADDR MPC5XXX_SRAM -#define CONFIG_SYS_INIT_RAM_END MPC5XXX_SRAM_SIZE +#define CONFIG_SYS_INIT_RAM_SIZE MPC5XXX_SRAM_SIZE -#define CONFIG_SYS_GBL_DATA_OFFSET (CONFIG_SYS_INIT_RAM_END - \ +#define CONFIG_SYS_GBL_DATA_OFFSET (CONFIG_SYS_INIT_RAM_SIZE - \ GENERATED_GBL_DATA_SIZE) #define CONFIG_SYS_INIT_SP_OFFSET CONFIG_SYS_GBL_DATA_OFFSET @@ -241,15 +228,12 @@ * +- 31 0 PSC1 */ - /* * Miscellaneous configurable options */ #define CONFIG_SYS_LONGHELP #define CONFIG_CMDLINE_EDITING -#define CONFIG_SYS_HUSH_PARSER -#define CONFIG_SYS_PROMPT_HUSH_PS2 "> " #if defined(CONFIG_CMD_KGDB) #define CONFIG_SYS_CBSIZE 1024 @@ -265,7 +249,6 @@ #define CONFIG_SYS_LOAD_ADDR 0x00100000 -#define CONFIG_LOOPW #define CONFIG_SYS_CONSOLE_INFO_QUIET /* don't print console @ startup*/ /* @@ -338,9 +321,7 @@ * Environment Configuration */ -#define CONFIG_BOOTDELAY 3 /* -1 disables auto-boot */ #undef CONFIG_BOOTARGS -#define CONFIG_ZERO_BOOTDELAY_CHECK #define CONFIG_SYS_AUTOLOAD "n"