X-Git-Url: http://git.ipfire.org/?p=people%2Fms%2Fu-boot.git;a=blobdiff_plain;f=include%2Fconfigs%2Fids8313.h;h=6b6bbbd5c027a4e1e6d9f1cacb75ac6c06fa3c73;hp=8b4278dfd36bb04aef379d4ef2d8f4e558705d8e;hb=c9032ce168c1344fe8ffe8604825ec343ec14adf;hpb=42eccdd650915962345daeae831dab183d67511b diff --git a/include/configs/ids8313.h b/include/configs/ids8313.h index 8b4278dfd3..6b6bbbd5c0 100644 --- a/include/configs/ids8313.h +++ b/include/configs/ids8313.h @@ -19,19 +19,12 @@ #define CONFIG_MPC8313 #define CONFIG_IDS8313 -#define CONFIG_SYS_GENERIC_BOARD - #define CONFIG_FSL_ELBC #define CONFIG_MISC_INIT_R -#define CONFIG_AUTOBOOT_KEYED -#define CONFIG_AUTOBOOT_PROMPT \ - "\nEnter password - autoboot in %d seconds...\n", CONFIG_BOOTDELAY -#define CONFIG_AUTOBOOT_DELAY_STR "ids" #define CONFIG_BOOT_RETRY_TIME 900 #define CONFIG_BOOT_RETRY_MIN 30 -#define CONFIG_BOOTDELAY 1 #define CONFIG_RESET_TO_RETRY #define CONFIG_83XX_CLKIN 66000000 /* in Hz */ @@ -282,7 +275,6 @@ /* * I2C setup */ -#define CONFIG_CMD_I2C #define CONFIG_SYS_I2C #define CONFIG_SYS_I2C_FSL #define CONFIG_SYS_FSL_I2C_SPEED 400000 @@ -296,7 +288,6 @@ */ #ifdef CONFIG_HARD_SPI #define CONFIG_MPC8XXX_SPI -#define CONFIG_CMD_SPI #define CONFIG_SYS_GPIO1_PRELIM #define CONFIG_SYS_GPIO1_DIR 0x00000001 #define CONFIG_SYS_GPIO1_DAT 0x00000001 @@ -328,7 +319,6 @@ * Serial Port */ #define CONFIG_CONS_INDEX 1 -#define CONFIG_SYS_NS16550 #define CONFIG_SYS_NS16550_SERIAL #define CONFIG_SYS_NS16550_REG_SIZE 1 @@ -422,28 +412,14 @@ /* * U-Boot environment setup */ -#include - -#define CONFIG_CMD_DHCP -#define CONFIG_CMD_PING -#define CONFIG_CMD_NFS #define CONFIG_CMD_NAND -#define CONFIG_CMD_FLASH -#define CONFIG_CMD_SNTP -#define CONFIG_CMD_MII -#define CONFIG_CMD_DATE #define CONFIG_CMDLINE_EDITING -#define CONFIG_CMD_EDITENV #define CONFIG_CMD_JFFS2 #define CONFIG_BOOTP_SUBNETMASK #define CONFIG_BOOTP_GATEWAY #define CONFIG_BOOTP_HOSTNAME #define CONFIG_BOOTP_BOOTPATH #define CONFIG_BOOTP_BOOTFILESIZE -/* pass open firmware flat tree */ -#define CONFIG_OF_LIBFDT -#define CONFIG_OF_BOARD_SETUP -#define CONFIG_OF_STDOUT_VIA_ALIAS /* * The reserved memory @@ -462,7 +438,6 @@ #define CONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR + CONFIG_ENV_SIZE) #define CONFIG_ENV_SIZE_REDUND (CONFIG_ENV_SIZE) - #define CONFIG_NETDEV eth1 #define CONFIG_HOSTNAME ids8313 #define CONFIG_ROOTPATH "/opt/eldk-4.2/ppc_6xx" @@ -473,8 +448,6 @@ #define CONFIG_CMD_ENV_FLAGS #define CONFIG_ENV_FLAGS_LIST_STATIC "ethaddr:mo,eth1addr:mo" -#define CONFIG_BAUDRATE 115200 - /* Initial Memory map for Linux*/ #define CONFIG_SYS_BOOTMAPSZ (256 << 20) @@ -487,8 +460,6 @@ + sizeof(CONFIG_SYS_PROMPT)+16) #define CONFIG_SYS_MAXARGS 16 #define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE -#define CONFIG_SYS_HUSH_PARSER /* use "hush" command parser */ -#define CONFIG_SYS_PROMPT_HUSH_PS2 "> " #define CONFIG_SYS_MEMTEST_START 0x00001000 #define CONFIG_SYS_MEMTEST_END 0x00C00000 @@ -559,7 +530,6 @@ /* UBI Support */ #define CONFIG_CMD_NAND_TRIMFFS -#define CONFIG_CMD_UBI #define CONFIG_CMD_UBIFS #define CONFIG_RBTREE #define CONFIG_LZO @@ -571,10 +541,7 @@ #define CONFIG_BOOTCOUNT_ALEN 1 #define CONFIG_SYS_BOOTCOUNT_ADDR 0x9 -#define CONFIG_VERSION_VARIABLE - #define CONFIG_IMAGE_FORMAT_LEGACY -#define CONFIG_CMD_FDT #define CONFIG_CMD_HASH #define CONFIG_SHA1 #define CONFIG_SHA256