X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=include%2Fconfigs%2FBSC9131RDB.h;h=c3a7e1da3ef7d423874802d425c3ee55f9fb9a06;hb=38d2831d3b1bc618c36fcba855368e9ac239f3cc;hp=92c69e5cf25f4b25189f38f53c84348b6bf60d85;hpb=b58d3512442357cb023bce69f55c08b9fd21beaa;p=u-boot diff --git a/include/configs/BSC9131RDB.h b/include/configs/BSC9131RDB.h index 92c69e5cf2..c3a7e1da3e 100644 --- a/include/configs/BSC9131RDB.h +++ b/include/configs/BSC9131RDB.h @@ -11,12 +11,7 @@ #ifndef __CONFIG_H #define __CONFIG_H -#define CONFIG_DISPLAY_BOARDINFO - -#ifdef CONFIG_BSC9131RDB -#define CONFIG_BSC9131 #define CONFIG_NAND_FSL_IFC -#endif #ifdef CONFIG_SPIFLASH #define CONFIG_RAMBOOT_SPIFLASH @@ -51,12 +46,7 @@ #endif /* High Level Configuration Options */ -#define CONFIG_BOOKE /* BOOKE */ -#define CONFIG_E500 /* BOOKE e500 family */ -#define CONFIG_FSL_IFC /* Enable IFC Support */ -#define CONFIG_FSL_CAAM /* Enable SEC/CAAM */ -#define CONFIG_FSL_LAW /* Use common FSL init code */ #define CONFIG_TSEC_ENET #define CONFIG_ENV_OVERWRITE @@ -78,7 +68,6 @@ #define CONFIG_SYS_MEMTEST_END 0x01ffffff /* DDR Setup */ -#define CONFIG_SYS_FSL_DDR3 #undef CONFIG_SYS_DDR_RAW_TIMING #undef CONFIG_DDR_SPD #define CONFIG_SYS_SPD_BUS_NUM 0 @@ -93,7 +82,6 @@ extern unsigned long get_sdram_size(void); #define CONFIG_SYS_DDR_SDRAM_BASE 0x00000000 #define CONFIG_SYS_SDRAM_BASE CONFIG_SYS_DDR_SDRAM_BASE -#define CONFIG_NUM_DDR_CONTROLLERS 1 #define CONFIG_DIMM_SLOTS_PER_CTLR 1 #define CONFIG_CHIP_SELECTS_PER_CTRL 1 @@ -158,7 +146,6 @@ extern unsigned long get_sdram_size(void); /* * IFC Definitions */ -#define CONFIG_SYS_NO_FLASH /* NAND Flash on IFC */ #define CONFIG_SYS_NAND_BASE 0xff800000 @@ -194,7 +181,6 @@ extern unsigned long get_sdram_size(void); #define CONFIG_SYS_NAND_BASE_LIST { CONFIG_SYS_NAND_BASE } #define CONFIG_SYS_MAX_NAND_DEVICE 1 -#define CONFIG_CMD_NAND #define CONFIG_SYS_NAND_BLOCK_SIZE (128 * 1024) #define CONFIG_SYS_NAND_DDR_LAW 11 @@ -208,8 +194,6 @@ extern unsigned long get_sdram_size(void); #define CONFIG_SYS_CS0_FTIM2 CONFIG_SYS_NAND_FTIM2 #define CONFIG_SYS_CS0_FTIM3 CONFIG_SYS_NAND_FTIM3 -#define CONFIG_BOARD_EARLY_INIT_F /* Call board_pre_init */ - #define CONFIG_SYS_INIT_RAM_LOCK #define CONFIG_SYS_INIT_RAM_ADDR 0xffd00000 /* stack in RAM */ #define CONFIG_SYS_INIT_RAM_SIZE 0x00004000/* End of used area in RAM */ @@ -231,8 +215,6 @@ extern unsigned long get_sdram_size(void); #define CONFIG_NS16550_MIN_FUNCTIONS #endif -#define CONFIG_SYS_CONSOLE_IS_IN_ENV /* determine from environment */ - #define CONFIG_SYS_BAUDRATE_TABLE \ {300, 600, 1200, 2400, 4800, 9600, 19200, 38400, 57600, 115200} @@ -245,7 +227,6 @@ extern unsigned long get_sdram_size(void); #define CONFIG_SYS_FSL_I2C_OFFSET 0x3000 /* I2C EEPROM */ -#define CONFIG_CMD_EEPROM #define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 1 #define CONFIG_SYS_EEPROM_PAGE_WRITE_BITS 3 #define CONFIG_SYS_EEPROM_PAGE_WRITE_DELAY_MS 5 @@ -277,15 +258,12 @@ extern unsigned long get_sdram_size(void); #define CONFIG_ETHPRIME "eTSEC1" -#define CONFIG_PHY_GIGE /* Include GbE speed/duplex detection */ - #endif /* CONFIG_TSEC_ENET */ /* * Environment */ #if defined(CONFIG_RAMBOOT_SPIFLASH) -#define CONFIG_ENV_IS_IN_SPI_FLASH #define CONFIG_ENV_SPI_BUS 0 #define CONFIG_ENV_SPI_CS 0 #define CONFIG_ENV_SPI_MAX_HZ 10000000 @@ -294,13 +272,11 @@ extern unsigned long get_sdram_size(void); #define CONFIG_ENV_SECT_SIZE 0x10000 #define CONFIG_ENV_SIZE 0x2000 #elif defined(CONFIG_NAND) -#define CONFIG_ENV_IS_IN_NAND #define CONFIG_SYS_EXTRA_ENV_RELOC #define CONFIG_ENV_SIZE CONFIG_SYS_NAND_BLOCK_SIZE #define CONFIG_ENV_OFFSET ((768 * 1024) + CONFIG_SYS_NAND_BLOCK_SIZE) #define CONFIG_ENV_RANGE (3 * CONFIG_ENV_SIZE) #elif defined(CONFIG_SYS_RAMBOOT) -#define CONFIG_ENV_IS_NOWHERE /* Store ENV in memory only */ #define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE - 0x1000) #define CONFIG_ENV_SIZE 0x2000 #endif @@ -308,14 +284,6 @@ extern unsigned long get_sdram_size(void); #define CONFIG_LOADS_ECHO /* echo on for serial download */ #define CONFIG_SYS_LOADS_BAUD_CHANGE /* allow baudrate change */ -/* - * Command line configuration. - */ -#define CONFIG_CMD_ERRATA -#define CONFIG_CMD_IRQ -#define CONFIG_DOS_PARTITION -#define CONFIG_CMD_REGINFO - /* * Miscellaneous configurable options */ @@ -329,9 +297,6 @@ extern unsigned long get_sdram_size(void); #else #define CONFIG_SYS_CBSIZE 1024 /* 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 */ /* @@ -346,15 +311,7 @@ extern unsigned long get_sdram_size(void); #define CONFIG_KGDB_BAUDRATE 230400 /* speed to run kgdb serial port */ #endif -/* Hash command with SHA acceleration supported in hardware */ -#ifdef CONFIG_FSL_CAAM -#define CONFIG_CMD_HASH -#define CONFIG_SHA_HW_ACCEL -#endif - -#define CONFIG_USB_EHCI - -#ifdef CONFIG_USB_EHCI +#ifdef CONFIG_USB_EHCI_HCD #define CONFIG_EHCI_HCD_INIT_AFTER_RESET #define CONFIG_USB_EHCI_FSL #define CONFIG_HAS_FSL_DR_USB @@ -365,17 +322,6 @@ extern unsigned long get_sdram_size(void); */ #define CONFIG_MTD_DEVICE #define CONFIG_MTD_PARTITIONS -#define CONFIG_CMD_MTDPARTS -#define MTDIDS_DEFAULT "nand0=ff800000.flash," -#define MTDPARTS_DEFAULT "mtdparts=ff800000.flash:1m(uboot)," \ - "8m(kernel),512k(dtb),-(fs)" -/* - * Override partitions in device tree using info - * in "mtdparts" environment variable - */ -#ifdef CONFIG_CMD_MTDPARTS -#define CONFIG_FDT_FIXUP_PARTITIONS -#endif /* * Environment Configuration @@ -390,8 +336,6 @@ extern unsigned long get_sdram_size(void); #define CONFIG_BOOTFILE "uImage" #define CONFIG_UBOOTPATH "u-boot.bin" /* U-Boot image on TFTP server */ -#define CONFIG_BAUDRATE 115200 - #define CONFIG_EXTRA_ENV_SETTINGS \ "netdev=eth0\0" \ "uboot=" CONFIG_UBOOTPATH "\0" \