X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=include%2Fconfigs%2FM5253DEMO.h;h=ff0995e651a6907f80003dff5326c7ea6e69b291;hb=80286e8f811341e6054a85b69e2573a778ba42cf;hp=5d978747fe8ae5fc8faac0261aa607563f0275ed;hpb=e536ab8849b2b4f6d68bbc8e1d1f9bc033db06bd;p=u-boot diff --git a/include/configs/M5253DEMO.h b/include/configs/M5253DEMO.h index 5d978747fe..ff0995e651 100644 --- a/include/configs/M5253DEMO.h +++ b/include/configs/M5253DEMO.h @@ -13,11 +13,9 @@ #define CONFIG_MCFUART #define CONFIG_SYS_UART_PORT (0) -#define CONFIG_BAUDRATE 115200 #undef CONFIG_WATCHDOG /* disable watchdog */ -#define CONFIG_BOOTDELAY 5 /* Configuration for environment * Environment is embedded in u-boot in the second sector of the flash @@ -25,36 +23,21 @@ #ifdef CONFIG_MONITOR_IS_IN_RAM # define CONFIG_ENV_OFFSET 0x4000 # define CONFIG_ENV_SECT_SIZE 0x1000 -# define CONFIG_ENV_IS_IN_FLASH 1 #else # define CONFIG_ENV_ADDR (CONFIG_SYS_FLASH_BASE + 0x4000) # define CONFIG_ENV_SECT_SIZE 0x1000 -# define CONFIG_ENV_IS_IN_FLASH 1 #endif #define LDS_BOARD_TEXT \ - . = DEFINED(env_offset) ? env_offset : .; \ - common/env_embedded.o (.text*); + . = DEFINED(env_offset) ? env_offset : .; \ + env/embedded.o(.text*); /* * Command line configuration. */ -#include - -#define CONFIG_CMD_CACHE -#define CONFIG_CMD_LOADB -#define CONFIG_CMD_LOADS -#define CONFIG_CMD_EXT2 -#define CONFIG_CMD_FAT -#define CONFIG_CMD_IDE -#define CONFIG_CMD_MEMORY -#define CONFIG_CMD_MISC -#define CONFIG_CMD_PING - -#ifdef CONFIG_CMD_IDE + +#ifdef CONFIG_IDE /* ATA */ -# define CONFIG_DOS_PARTITION -# define CONFIG_MAC_PARTITION # define CONFIG_IDE_RESET 1 # define CONFIG_IDE_PREINIT 1 # define CONFIG_ATAPI @@ -111,15 +94,6 @@ #define CONFIG_SYS_LONGHELP /* undef to save memory */ -#if defined(CONFIG_CMD_KGDB) -# define CONFIG_SYS_CBSIZE 1024 /* Console I/O Buffer Size */ -#else -# define CONFIG_SYS_CBSIZE 256 /* Console I/O Buffer Size */ -#endif -#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE+sizeof(CONFIG_SYS_PROMPT)+16) /* Print Buffer Size */ -#define CONFIG_SYS_MAXARGS 16 /* max number of command args */ -#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE /* Boot Argument Buffer Size */ - #define CONFIG_SYS_LOAD_ADDR 0x00100000 #define CONFIG_SYS_MEMTEST_START 0x400