[U-Boot] [PATCH 4/4] include/configs: Whitespace fixup

A number of moveconfig.py runs have left a instances of multiple empty lines in a row. Correct this to a single empty line.

Signed-off-by: Tom Rini trini@konsulko.com --- include/configs/B4860QDS.h | 1 - include/configs/BSC9131RDB.h | 1 - include/configs/BSC9132QDS.h | 3 --- include/configs/C29XPCIE.h | 1 - include/configs/CPCI2DP.h | 4 ---- include/configs/CPCI4052.h | 2 -- include/configs/M5235EVB.h | 1 - include/configs/M5253EVBE.h | 1 - include/configs/M5275EVB.h | 1 - include/configs/MIP405.h | 7 ------- include/configs/MPC8313ERDB.h | 3 --- include/configs/MPC8315ERDB.h | 1 - include/configs/MPC832XEMDS.h | 3 --- include/configs/MPC8349EMDS.h | 3 --- include/configs/MPC8349ITX.h | 2 -- include/configs/MPC837XEMDS.h | 2 -- include/configs/MPC837XERDB.h | 1 - include/configs/MPC8536DS.h | 1 - include/configs/MPC8540ADS.h | 9 --------- include/configs/MPC8541CDS.h | 4 ---- include/configs/MPC8544DS.h | 4 ---- include/configs/MPC8548CDS.h | 5 ----- include/configs/MPC8555CDS.h | 5 ----- include/configs/MPC8560ADS.h | 7 ------- include/configs/MPC8568MDS.h | 8 -------- include/configs/MPC8569MDS.h | 2 -- include/configs/MPC8572DS.h | 4 ---- include/configs/MPC8610HPCD.h | 10 ---------- include/configs/MPC8641HPCN.h | 7 ------- include/configs/P1010RDB.h | 2 -- include/configs/P1022DS.h | 2 -- include/configs/PATI.h | 7 ------- include/configs/PIP405.h | 8 -------- include/configs/PLU405.h | 3 --- include/configs/PMC405DE.h | 1 - include/configs/PMC440.h | 1 - include/configs/T102xQDS.h | 2 -- include/configs/T102xRDB.h | 2 -- include/configs/T1040QDS.h | 1 - include/configs/T104xRDB.h | 1 - include/configs/T208xQDS.h | 1 - include/configs/T208xRDB.h | 1 - include/configs/T4240QDS.h | 3 --- include/configs/T4240RDB.h | 6 ------ include/configs/TQM5200.h | 5 ----- include/configs/TQM823L.h | 3 --- include/configs/TQM823M.h | 2 -- include/configs/TQM834x.h | 2 -- include/configs/TQM850L.h | 1 - include/configs/TQM850M.h | 3 --- include/configs/TQM855L.h | 2 -- include/configs/TQM855M.h | 2 -- include/configs/TQM860L.h | 2 -- include/configs/TQM860M.h | 2 -- include/configs/TQM862L.h | 2 -- include/configs/TQM862M.h | 2 -- include/configs/TQM866M.h | 2 -- include/configs/VCMA9.h | 3 --- include/configs/VOM405.h | 1 - include/configs/a3m071.h | 1 - include/configs/a4m072.h | 3 --- include/configs/ac14xx.h | 1 - include/configs/am3517_crane.h | 1 - include/configs/amcc-common.h | 2 -- include/configs/apf27.h | 1 - include/configs/apx4devkit.h | 2 -- include/configs/astro_mcf5373l.h | 1 - include/configs/at91rm9200ek.h | 1 - include/configs/at91sam9rlek.h | 1 - include/configs/at91sam9x5ek.h | 1 - include/configs/atngw100.h | 2 -- include/configs/atngw100mkii.h | 2 -- include/configs/atstk1002.h | 1 - include/configs/baltos.h | 1 - include/configs/bct-brettl2.h | 9 --------- include/configs/bf506f-ezkit.h | 5 ----- include/configs/bf518f-ezbrd.h | 9 --------- include/configs/bf526-ezbrd.h | 11 ----------- include/configs/bf527-ad7160-eval.h | 10 ---------- include/configs/bf527-ezkit.h | 9 --------- include/configs/bf527-sdp.h | 8 -------- include/configs/bf533-ezkit.h | 6 ------ include/configs/bf533-stamp.h | 6 ------ include/configs/bf537-minotaur.h | 9 --------- include/configs/bf537-pnav.h | 10 ---------- include/configs/bf537-srv1.h | 8 -------- include/configs/bf537-stamp.h | 10 ---------- include/configs/bf538f-ezkit.h | 8 -------- include/configs/bf548-ezkit.h | 12 ------------ include/configs/bf561-acvilon.h | 11 ----------- include/configs/bf561-ezkit.h | 7 ------- include/configs/bf609-ezkit.h | 1 - include/configs/br4.h | 8 -------- include/configs/canmb.h | 1 - include/configs/charon.h | 1 - include/configs/cm-bf527.h | 8 -------- include/configs/cm-bf533.h | 7 ------- include/configs/cm-bf537e.h | 9 --------- include/configs/cm-bf537u.h | 8 -------- include/configs/cm-bf548.h | 9 --------- include/configs/cm-bf561.h | 7 ------- include/configs/cm5200.h | 4 ---- include/configs/cm_t335.h | 1 - include/configs/cm_t35.h | 1 - include/configs/cm_t3517.h | 1 - include/configs/cm_t43.h | 1 - include/configs/cobra5272.h | 2 -- include/configs/controlcenterd.h | 4 ---- include/configs/crownbay.h | 1 - include/configs/cyrus.h | 4 ---- include/configs/da850evm.h | 1 - include/configs/dbau1x00.h | 4 ---- include/configs/devkit8000.h | 1 - include/configs/dockstar.h | 1 - include/configs/draco.h | 2 -- include/configs/dragonboard410c.h | 1 - include/configs/duovero.h | 1 - include/configs/ea20.h | 2 -- include/configs/eco5pk.h | 1 - include/configs/edb93xx.h | 6 ------ include/configs/ethernut5.h | 1 - include/configs/exynos-common.h | 1 - include/configs/exynos5-common.h | 1 - include/configs/flea3.h | 1 - include/configs/goflexhome.h | 1 - include/configs/grsim_leon2.h | 1 - include/configs/guruplug.h | 1 - include/configs/h2200.h | 1 - include/configs/highbank.h | 1 - include/configs/hikey.h | 1 - include/configs/hrcon.h | 2 -- include/configs/ibf-dsp561.h | 7 ------- include/configs/iconnect.h | 1 - include/configs/ids8313.h | 2 -- include/configs/imx31_phycore.h | 2 -- include/configs/inka4x0.h | 2 -- include/configs/integrator-common.h | 1 - include/configs/integratorap.h | 2 -- include/configs/intip.h | 2 -- include/configs/ip04.h | 10 ---------- include/configs/ipam390.h | 2 -- include/configs/jupiter.h | 4 ---- include/configs/kc1.h | 1 - include/configs/km8360.h | 1 - include/configs/km_kirkwood.h | 1 - include/configs/legoev3.h | 2 -- include/configs/ls1043aqds.h | 1 - include/configs/ls2080a_common.h | 3 --- include/configs/ls2080a_simu.h | 1 - include/configs/ls2080aqds.h | 1 - include/configs/ls2080ardb.h | 1 - include/configs/lsxl.h | 3 --- include/configs/lwmon5.h | 2 -- include/configs/m28evk.h | 1 - include/configs/m53evk.h | 1 - include/configs/mcx.h | 1 - include/configs/mecp5123.h | 1 - include/configs/meesc.h | 1 - include/configs/minnowmax.h | 1 - include/configs/mpc5121ads.h | 3 --- include/configs/ms7720se.h | 1 - include/configs/ms7750se.h | 1 - include/configs/mv-plug-common.h | 1 - include/configs/mx31ads.h | 2 -- include/configs/mx31pdk.h | 2 -- include/configs/mx35pdk.h | 1 - include/configs/mx53ard.h | 1 - include/configs/mx6sabre_common.h | 1 - include/configs/mx6sxsabreauto.h | 4 ---- include/configs/mx6sxsabresd.h | 4 ---- include/configs/mx6ul_14x14_evk.h | 1 - include/configs/neo.h | 1 - include/configs/nitrogen6x.h | 1 - include/configs/odroid.h | 1 - include/configs/omap3_igep00x0.h | 1 - include/configs/omap3_logic.h | 1 - include/configs/omap3_zoom1.h | 1 - include/configs/omap4_panda.h | 1 - include/configs/openrisc-generic.h | 1 - include/configs/ot1200.h | 1 - include/configs/p1_p2_rdb_pc.h | 3 --- include/configs/pb1x00.h | 4 ---- include/configs/pcm030.h | 1 - include/configs/pengwyn.h | 3 --- include/configs/pm9261.h | 1 - include/configs/pm9263.h | 1 - include/configs/pm9g45.h | 1 - include/configs/pogo_e02.h | 1 - include/configs/pr1.h | 9 --------- include/configs/pxm2.h | 2 -- include/configs/qemu-mips64.h | 1 - include/configs/r0p7734.h | 1 - include/configs/rastaban.h | 3 --- include/configs/rk3036_common.h | 1 - include/configs/rk3288_common.h | 1 - include/configs/rut.h | 1 - include/configs/s5pc210_universal.h | 1 - include/configs/sandbox.h | 1 - include/configs/sbc8349.h | 3 --- include/configs/sbc8548.h | 5 ----- include/configs/sbc8641d.h | 3 --- include/configs/secomx6quq7.h | 1 - include/configs/sh7785lcr.h | 1 - include/configs/sheevaplug.h | 1 - include/configs/siemens-am33x-common.h | 3 --- include/configs/smartweb.h | 1 - include/configs/smdk2410.h | 2 -- include/configs/smdkv310.h | 1 - include/configs/sniper.h | 1 - include/configs/socfpga_common.h | 1 - include/configs/socrates.h | 5 ----- include/configs/spear-common.h | 2 -- include/configs/strider.h | 1 - include/configs/sun8i.h | 1 - include/configs/t3corp.h | 1 - include/configs/t4qds.h | 3 --- include/configs/tam3517-common.h | 1 - include/configs/taurus.h | 3 --- include/configs/tcm-bf518.h | 8 -------- include/configs/tcm-bf537.h | 9 --------- include/configs/theadorable.h | 1 - include/configs/thuban.h | 2 -- include/configs/thunderx_88xx.h | 3 --- include/configs/ti816x_evm.h | 1 - include/configs/ti_omap3_common.h | 1 - include/configs/ti_omap5_common.h | 2 -- include/configs/tqma6.h | 1 - include/configs/tqma6_wru4.h | 1 - include/configs/trats.h | 2 -- include/configs/trats2.h | 1 - include/configs/tricorder.h | 1 - include/configs/uniphier.h | 1 - include/configs/v38b.h | 3 --- include/configs/ve8313.h | 1 - include/configs/vexpress_aemv8a.h | 1 - include/configs/vinco.h | 4 ---- include/configs/warp7.h | 1 - include/configs/woodburn_common.h | 2 -- include/configs/work_92105.h | 1 - include/configs/x600.h | 1 - include/configs/x86-common.h | 1 - include/configs/xilinx-ppc.h | 1 - include/configs/xpedite550x.h | 1 - include/configs/zmx25.h | 2 -- include/configs/zynq-common.h | 1 - 245 files changed, 676 deletions(-)

diff --git a/include/configs/B4860QDS.h b/include/configs/B4860QDS.h index cda5a65..a9c6272 100644 --- a/include/configs/B4860QDS.h +++ b/include/configs/B4860QDS.h @@ -712,7 +712,6 @@ unsigned long get_board_ddr_clk(void); #define CONFIG_SYS_FM1_10GEC1_PHY_ADDR 0x7 /*SLOT 1*/ #define CONFIG_SYS_FM1_10GEC2_PHY_ADDR 0x6 /*SLOT 2*/

- #define CONFIG_SYS_FM1_DTSEC1_RISER_PHY_ADDR 0x1c #define CONFIG_SYS_FM1_DTSEC2_RISER_PHY_ADDR 0x1d #define CONFIG_SYS_FM1_DTSEC3_RISER_PHY_ADDR 0x1e diff --git a/include/configs/BSC9131RDB.h b/include/configs/BSC9131RDB.h index 42cc6db..07070cd 100644 --- a/include/configs/BSC9131RDB.h +++ b/include/configs/BSC9131RDB.h @@ -52,7 +52,6 @@ #define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE /* start of monitor */ #endif

- /* High Level Configuration Options */ #define CONFIG_BOOKE /* BOOKE */ #define CONFIG_E500 /* BOOKE e500 family */ diff --git a/include/configs/BSC9132QDS.h b/include/configs/BSC9132QDS.h index 51bdc0f..1eb2ff6 100644 --- a/include/configs/BSC9132QDS.h +++ b/include/configs/BSC9132QDS.h @@ -93,7 +93,6 @@

#define CONFIG_CMD_PCI

- /* * PCI Windows * Memory space is mapped 1-1, but I/O space must start from 0. @@ -223,7 +222,6 @@ combinations. this should be removed later #define CONFIG_SYS_DDR_TIMING_5 CONFIG_SYS_DDR_TIMING_5_800 #endif

- /* relocated CCSRBAR */ #define CONFIG_SYS_CCSRBAR CONFIG_SYS_CCSRBAR_DEFAULT #define CONFIG_SYS_CCSRBAR_PHYS_LOW CONFIG_SYS_CCSRBAR_DEFAULT @@ -590,7 +588,6 @@ combinations. this should be removed later #define CONFIG_SYS_MAXARGS 16 /* max number of command args */ #define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE/* Boot Argument Buffer Size */

- /* * For booting Linux, the board info and command line data * have to be in the first 64 MB of memory, since this is diff --git a/include/configs/C29XPCIE.h b/include/configs/C29XPCIE.h index ba5fbfd..1600417 100644 --- a/include/configs/C29XPCIE.h +++ b/include/configs/C29XPCIE.h @@ -100,7 +100,6 @@

#define CONFIG_CMD_PCI

- /* * PCI Windows * Memory space is mapped 1-1, but I/O space must start from 0. diff --git a/include/configs/CPCI2DP.h b/include/configs/CPCI2DP.h index 1c4b01f..b60da5e 100644 --- a/include/configs/CPCI2DP.h +++ b/include/configs/CPCI2DP.h @@ -48,7 +48,6 @@ #define CONFIG_BOOTP_GATEWAY #define CONFIG_BOOTP_HOSTNAME

- /* * Command line configuration. */ @@ -57,7 +56,6 @@ #define CONFIG_CMD_BSP #define CONFIG_CMD_EEPROM

- #undef CONFIG_WATCHDOG /* watchdog disabled */

#define CONFIG_SDRAM_BANK0 1 /* init onboard SDRAM bank 0 */ @@ -67,7 +65,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 @@ -102,7 +99,6 @@ #define CONFIG_SYS_LOAD_ADDR 0x100000 /* default load address */ #define CONFIG_SYS_EXTBDINFO 1 /* To use extended board_into (bd_t) */

- #define CONFIG_ZERO_BOOTDELAY_CHECK /* check for keypress on bootdelay==0 */

#define CONFIG_VERSION_VARIABLE 1 /* include version env variable */ diff --git a/include/configs/CPCI4052.h b/include/configs/CPCI4052.h index 51054a1..de6ff7f 100644 --- a/include/configs/CPCI4052.h +++ b/include/configs/CPCI4052.h @@ -62,7 +62,6 @@ #define CONFIG_BOOTP_DNS2 #define CONFIG_BOOTP_SEND_HOSTNAME

- /* * Command line configuration. */ @@ -89,7 +88,6 @@ */ #undef CONFIG_SYS_LONGHELP /* undef to save memory */

- #if defined(CONFIG_CMD_KGDB) #define CONFIG_SYS_CBSIZE 1024 /* Console I/O Buffer Size */ #else diff --git a/include/configs/M5235EVB.h b/include/configs/M5235EVB.h index efc7827..b5d49b5 100644 --- a/include/configs/M5235EVB.h +++ b/include/configs/M5235EVB.h @@ -40,7 +40,6 @@ #define CONFIG_CMD_PCI #define CONFIG_CMD_REGINFO

- #define CONFIG_MCFFEC #ifdef CONFIG_MCFFEC # define CONFIG_MII 1 diff --git a/include/configs/M5253EVBE.h b/include/configs/M5253EVBE.h index 7f5ee8a..e5aa1c7 100644 --- a/include/configs/M5253EVBE.h +++ b/include/configs/M5253EVBE.h @@ -37,7 +37,6 @@ . = DEFINED(env_offset) ? env_offset : .; \ common/env_embedded.o (.text)

- /* * BOOTP options */ diff --git a/include/configs/M5275EVB.h b/include/configs/M5275EVB.h index 5f055e7..5f3ec3f 100644 --- a/include/configs/M5275EVB.h +++ b/include/configs/M5275EVB.h @@ -58,7 +58,6 @@ #define CONFIG_CMD_CACHE #define CONFIG_CMD_MII

- #define CONFIG_MCFFEC #ifdef CONFIG_MCFFEC #define CONFIG_MII 1 diff --git a/include/configs/MIP405.h b/include/configs/MIP405.h index 8e2bd85..7c4509f 100644 --- a/include/configs/MIP405.h +++ b/include/configs/MIP405.h @@ -21,7 +21,6 @@

#define CONFIG_SYS_TEXT_BASE 0xFFF80000

- /*********************************************************** * Note that it may also be a MIP405T board which is a subset of the * MIP405 @@ -37,7 +36,6 @@ ***********************************************************/ #define CONFIG_SYS_CLK_FREQ 33000000 /* external frequency to pll */

- /* * BOOTP options */ @@ -46,7 +44,6 @@ #define CONFIG_BOOTP_GATEWAY #define CONFIG_BOOTP_HOSTNAME

- /* * Command line configuration. */ @@ -66,7 +63,6 @@ #if !defined(CONFIG_MIP405T) #endif

- /************************************************************** * I2C Stuff: * the MIP405 is equiped with an Atmel 24C128/256 EEPROM at address @@ -89,7 +85,6 @@ /* last 6 bits of the address */ #define CONFIG_SYS_EEPROM_PAGE_WRITE_DELAY_MS 10 /* and takes up to 10 msec */

- #define CONFIG_ENV_IS_IN_EEPROM 1 /* use EEPROM for environment vars */ #define CONFIG_ENV_OFFSET 0x00000 /* environment starts at the beginning of the EEPROM */ #define CONFIG_ENV_SIZE 0x00800 /* 2k bytes may be used for env vars */ @@ -280,7 +275,6 @@ #define MULTI_PURPOSE_SOCKET_ADDR 0xF8000000 #define CONFIG_PORT_ADDR PER_PLD_ADDR + 5

- /*----------------------------------------------------------------------- * Definitions for initial stack pointer and data area (in On Chip SRAM) */ @@ -406,5 +400,4 @@ #define CONFIG_IDENT_STRING "\n(c) 2003 by MPL AG Switzerland, PCI_BOOT Version" #endif

- #endif /* __CONFIG_H */ diff --git a/include/configs/MPC8313ERDB.h b/include/configs/MPC8313ERDB.h index 536fc06..4b7a773 100644 --- a/include/configs/MPC8313ERDB.h +++ b/include/configs/MPC8313ERDB.h @@ -276,7 +276,6 @@ #define CONFIG_SYS_NAND_BLOCK_SIZE 16384 #define CONFIG_SYS_NAND_WINDOW_SIZE (32 * 1024)

- #define CONFIG_SYS_NAND_BR_PRELIM (CONFIG_SYS_NAND_BASE \ | BR_DECC_CHK_GEN /* Use HW ECC */ \ | BR_PS_8 /* 8 bit port */ \ @@ -427,7 +426,6 @@ #define TSEC2_PHYIDX 0 #endif

- /* Options are: TSEC[0-1] */ #define CONFIG_ETHPRIME "TSEC1"

@@ -474,7 +472,6 @@ #define CONFIG_BOOTP_GATEWAY #define CONFIG_BOOTP_HOSTNAME

- /* * Command line configuration. */ diff --git a/include/configs/MPC8315ERDB.h b/include/configs/MPC8315ERDB.h index 9cb8012..d29519d 100644 --- a/include/configs/MPC8315ERDB.h +++ b/include/configs/MPC8315ERDB.h @@ -635,7 +635,6 @@ "tftp $fdtaddr $fdtfile;" \ "bootm $loadaddr $ramdiskaddr $fdtaddr"

- #define CONFIG_BOOTCOMMAND CONFIG_NFSBOOTCOMMAND

#endif /* __CONFIG_H */ diff --git a/include/configs/MPC832XEMDS.h b/include/configs/MPC832XEMDS.h index c1eb442..38bb613 100644 --- a/include/configs/MPC832XEMDS.h +++ b/include/configs/MPC832XEMDS.h @@ -337,7 +337,6 @@ #define CONFIG_SYS_PCI_SLV_MEM_BUS 0x00000000 #define CONFIG_SYS_PCI_SLV_MEM_SIZE 0x80000000

- #ifdef CONFIG_PCI #define CONFIG_PCI_INDIRECT_BRIDGE

@@ -407,7 +406,6 @@ #define CONFIG_BOOTP_GATEWAY #define CONFIG_BOOTP_HOSTNAME

- /* * Command line configuration. */ @@ -602,7 +600,6 @@ "tftp $fdtaddr $fdtfile;" \ "bootm $loadaddr $ramdiskaddr $fdtaddr"

- #define CONFIG_BOOTCOMMAND CONFIG_NFSBOOTCOMMAND

#endif /* __CONFIG_H */ diff --git a/include/configs/MPC8349EMDS.h b/include/configs/MPC8349EMDS.h index 7e0cb2a..b3a3bc5 100644 --- a/include/configs/MPC8349EMDS.h +++ b/include/configs/MPC8349EMDS.h @@ -464,7 +464,6 @@ #define CONFIG_LOADS_ECHO 1 /* echo on for serial download */ #define CONFIG_SYS_LOADS_BAUD_CHANGE 1 /* allow baudrate change */

- /* * BOOTP options */ @@ -473,7 +472,6 @@ #define CONFIG_BOOTP_GATEWAY #define CONFIG_BOOTP_HOSTNAME

- /* * Command line configuration. */ @@ -617,7 +615,6 @@ HID0_ENABLE_M_BIT |\ HID0_ENABLE_ADDRESS_BROADCAST) */

- #define CONFIG_SYS_HID2 HID2_HBE #define CONFIG_HIGH_BATS 1 /* High BATs supported */

diff --git a/include/configs/MPC8349ITX.h b/include/configs/MPC8349ITX.h index 447974c..9b3c6ea 100644 --- a/include/configs/MPC8349ITX.h +++ b/include/configs/MPC8349ITX.h @@ -484,7 +484,6 @@ boards, we say we have two, but don't display a message if we find only one. */ #define CONFIG_BOOTP_GATEWAY #define CONFIG_BOOTP_HOSTNAME

- /* * Command line configuration. */ @@ -710,7 +709,6 @@ boards, we say we have two, but don't display a message if we find only one. */ #define CONFIG_KGDB_BAUDRATE 230400 /* speed of kgdb serial port */ #endif

- /* * Environment Configuration */ diff --git a/include/configs/MPC837XEMDS.h b/include/configs/MPC837XEMDS.h index 09dd4c6..7f26ecb 100644 --- a/include/configs/MPC837XEMDS.h +++ b/include/configs/MPC837XEMDS.h @@ -475,7 +475,6 @@ extern int board_pci_host_broken(void); #define CONFIG_BOOTP_GATEWAY #define CONFIG_BOOTP_HOSTNAME

- /* * Command line configuration. */ @@ -695,7 +694,6 @@ extern int board_pci_host_broken(void); "tftp $fdtaddr $fdtfile;" \ "bootm $loadaddr $ramdiskaddr $fdtaddr"

- #define CONFIG_BOOTCOMMAND CONFIG_NFSBOOTCOMMAND

#endif /* __CONFIG_H */ diff --git a/include/configs/MPC837XERDB.h b/include/configs/MPC837XERDB.h index ff6c962..ebf30e7 100644 --- a/include/configs/MPC837XERDB.h +++ b/include/configs/MPC837XERDB.h @@ -486,7 +486,6 @@ #define CONFIG_BOOTP_GATEWAY #define CONFIG_BOOTP_HOSTNAME

- /* * Command line configuration. */ diff --git a/include/configs/MPC8536DS.h b/include/configs/MPC8536DS.h index c19e991..f22ba9b 100644 --- a/include/configs/MPC8536DS.h +++ b/include/configs/MPC8536DS.h @@ -156,7 +156,6 @@

#undef CONFIG_CLOCKS_IN_MHZ

- /* * Memory map -- xxx -this is wrong, needs updating * diff --git a/include/configs/MPC8540ADS.h b/include/configs/MPC8540ADS.h index 6e715f6..38bd38c 100644 --- a/include/configs/MPC8540ADS.h +++ b/include/configs/MPC8540ADS.h @@ -65,7 +65,6 @@ #define CONFIG_SYS_CLK_FREQ 33000000 #endif

- /* * These can be toggled for performance analysis, otherwise use default. */ @@ -136,7 +135,6 @@

#undef CONFIG_CLOCKS_IN_MHZ

- /* * Local Bus Definitions */ @@ -201,7 +199,6 @@ #define CONFIG_SYS_LBC_LSDMR_4 (CONFIG_SYS_LBC_LSDMR_COMMON | LSDMR_OP_MRW) #define CONFIG_SYS_LBC_LSDMR_5 (CONFIG_SYS_LBC_LSDMR_COMMON | LSDMR_OP_NORMAL)

- /* * 32KB, 8-bit wide for ADS config reg */ @@ -278,7 +275,6 @@

#endif /* CONFIG_PCI */

- #if defined(CONFIG_TSEC_ENET)

#define CONFIG_MII 1 /* MII PHY management */ @@ -293,7 +289,6 @@ #define TSEC1_FLAGS TSEC_GIGABIT #define TSEC2_FLAGS TSEC_GIGABIT

- #if CONFIG_HAS_FEC #define CONFIG_MPC85XX_FEC 1 #define CONFIG_MPC85XX_FEC_NAME "FEC" @@ -307,7 +302,6 @@

#endif /* CONFIG_TSEC_ENET */

- /* * Environment */ @@ -326,7 +320,6 @@ #define CONFIG_LOADS_ECHO 1 /* echo on for serial download */ #define CONFIG_SYS_LOADS_BAUD_CHANGE 1 /* allow baudrate change */

- /* * BOOTP options */ @@ -335,7 +328,6 @@ #define CONFIG_BOOTP_GATEWAY #define CONFIG_BOOTP_HOSTNAME

- /* * Command line configuration. */ @@ -377,7 +369,6 @@ #define CONFIG_KGDB_BAUDRATE 230400 /* speed to run kgdb serial port */ #endif

- /* * Environment Configuration */ diff --git a/include/configs/MPC8541CDS.h b/include/configs/MPC8541CDS.h index 1187310..4f49633 100644 --- a/include/configs/MPC8541CDS.h +++ b/include/configs/MPC8541CDS.h @@ -133,7 +133,6 @@ extern unsigned long get_clock_freq(void); #define CONFIG_SYS_FLASH_CFI #define CONFIG_SYS_FLASH_EMPTY_INFO

- /* * SDRAM on the Local Bus */ @@ -314,7 +313,6 @@ extern unsigned long get_clock_freq(void);

#endif /* CONFIG_PCI */

- #if defined(CONFIG_TSEC_ENET)

#define CONFIG_MII 1 /* MII PHY management */ @@ -353,7 +351,6 @@ extern unsigned long get_clock_freq(void); #define CONFIG_BOOTP_GATEWAY #define CONFIG_BOOTP_HOSTNAME

- /* * Command line configuration. */ @@ -365,7 +362,6 @@ extern unsigned long get_clock_freq(void); #define CONFIG_CMD_PCI #endif

- #undef CONFIG_WATCHDOG /* watchdog disabled */

/* diff --git a/include/configs/MPC8544DS.h b/include/configs/MPC8544DS.h index 535f648..435bdc8 100644 --- a/include/configs/MPC8544DS.h +++ b/include/configs/MPC8544DS.h @@ -179,12 +179,10 @@ extern unsigned long get_board_sys_clk(unsigned long dummy); #define PIXIS_VSPEED2_MASK (PIXIS_VSPEED2_TSEC1SER|PIXIS_VSPEED2_TSEC3SER) #define PIXIS_VCFGEN1_MASK (PIXIS_VCFGEN1_TSEC1SER|PIXIS_VCFGEN1_TSEC3SER)

- #define CONFIG_SYS_INIT_RAM_LOCK 1 #define CONFIG_SYS_INIT_RAM_ADDR 0xf4010000 /* Initial L1 address */ #define CONFIG_SYS_INIT_RAM_SIZE 0x00004000 /* Size of used area in RAM */

- #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

@@ -317,7 +315,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy);

#endif /* CONFIG_PCI */

- #if defined(CONFIG_TSEC_ENET)

#define CONFIG_MII 1 /* MII PHY management */ @@ -368,7 +365,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy); #define CONFIG_BOOTP_GATEWAY #define CONFIG_BOOTP_HOSTNAME

- /* * Command line configuration. */ diff --git a/include/configs/MPC8548CDS.h b/include/configs/MPC8548CDS.h index 8085969..0fdf939 100644 --- a/include/configs/MPC8548CDS.h +++ b/include/configs/MPC8548CDS.h @@ -132,7 +132,6 @@ extern unsigned long get_clock_freq(void); * */

- /* * Local Bus Definitions */ @@ -421,7 +420,6 @@ extern unsigned long get_clock_freq(void);

#endif /* CONFIG_PCI */

- #if defined(CONFIG_TSEC_ENET)

#define CONFIG_MII 1 /* MII PHY management */ @@ -479,7 +477,6 @@ extern unsigned long get_clock_freq(void); #define CONFIG_BOOTP_GATEWAY #define CONFIG_BOOTP_HOSTNAME

- /* * Command line configuration. */ @@ -491,7 +488,6 @@ extern unsigned long get_clock_freq(void); #define CONFIG_CMD_PCI #endif

- #undef CONFIG_WATCHDOG /* watchdog disabled */

/* @@ -580,7 +576,6 @@ extern unsigned long get_clock_freq(void); "tftp $fdtaddr $fdtfile;" \ "bootm $loadaddr - $fdtaddr"

- #define CONFIG_RAMBOOTCOMMAND \ "setenv bootargs root=/dev/ram rw " \ "console=$consoledev,$baudrate $othbootargs;" \ diff --git a/include/configs/MPC8555CDS.h b/include/configs/MPC8555CDS.h index d24309a..56f6ef5 100644 --- a/include/configs/MPC8555CDS.h +++ b/include/configs/MPC8555CDS.h @@ -33,7 +33,6 @@

#define CONFIG_FSL_VIA

- #ifndef __ASSEMBLY__ extern unsigned long get_clock_freq(void); #endif @@ -131,7 +130,6 @@ extern unsigned long get_clock_freq(void); #define CONFIG_SYS_FLASH_CFI #define CONFIG_SYS_FLASH_EMPTY_INFO

- /* * SDRAM on the Local Bus */ @@ -312,7 +310,6 @@ extern unsigned long get_clock_freq(void);

#endif /* CONFIG_PCI */

- #if defined(CONFIG_TSEC_ENET)

#define CONFIG_MII 1 /* MII PHY management */ @@ -351,7 +348,6 @@ extern unsigned long get_clock_freq(void); #define CONFIG_BOOTP_GATEWAY #define CONFIG_BOOTP_HOSTNAME

- /* * Command line configuration. */ @@ -363,7 +359,6 @@ extern unsigned long get_clock_freq(void); #define CONFIG_CMD_PCI #endif

- #undef CONFIG_WATCHDOG /* watchdog disabled */

/* diff --git a/include/configs/MPC8560ADS.h b/include/configs/MPC8560ADS.h index c0841db..c049d8d 100644 --- a/include/configs/MPC8560ADS.h +++ b/include/configs/MPC8560ADS.h @@ -60,7 +60,6 @@ #define CONFIG_SYS_CLK_FREQ 33000000 #endif

- /* * These can be toggled for performance analysis, otherwise use default. */ @@ -133,7 +132,6 @@

#undef CONFIG_CLOCKS_IN_MHZ

- /* * Local Bus Definitions */ @@ -198,7 +196,6 @@ #define CONFIG_SYS_LBC_LSDMR_4 (CONFIG_SYS_LBC_LSDMR_COMMON | LSDMR_OP_MRW) #define CONFIG_SYS_LBC_LSDMR_5 (CONFIG_SYS_LBC_LSDMR_COMMON | LSDMR_OP_NORMAL)

- /* * 32KB, 8-bit wide for ADS config reg */ @@ -273,7 +270,6 @@

#endif /* CONFIG_PCI */

- #ifdef CONFIG_TSEC_ENET

#ifndef CONFIG_MII @@ -345,7 +341,6 @@

#endif

- /* * Environment */ @@ -372,7 +367,6 @@ #define CONFIG_BOOTP_GATEWAY #define CONFIG_BOOTP_HOSTNAME

- /* * Command line configuration. */ @@ -419,7 +413,6 @@ #define CONFIG_KGDB_BAUDRATE 230400 /* speed to run kgdb serial port */ #endif

- /* * Environment Configuration */ diff --git a/include/configs/MPC8568MDS.h b/include/configs/MPC8568MDS.h index 47b0955..d42191b 100644 --- a/include/configs/MPC8568MDS.h +++ b/include/configs/MPC8568MDS.h @@ -51,7 +51,6 @@ extern unsigned long get_clock_freq(void); */ #define CONFIG_ENABLE_36BIT_PHYS 1

- #define CONFIG_BOARD_EARLY_INIT_F 1 /* Call board_pre_init */

#define CONFIG_SYS_MEMTEST_START 0x00200000 /* memtest works on */ @@ -144,14 +143,12 @@ extern unsigned long get_clock_freq(void); #define CONFIG_SYS_FLASH_CFI #define CONFIG_SYS_FLASH_EMPTY_INFO

- /* * SDRAM on the LocalBus */ #define CONFIG_SYS_LBC_SDRAM_BASE 0xf0000000 /* Localbus SDRAM */ #define CONFIG_SYS_LBC_SDRAM_SIZE 64 /* LBC SDRAM is 64MB */

- /*Chip select 2 - SDRAM*/ #define CONFIG_SYS_BR2_PRELIM 0xf0001861 #define CONFIG_SYS_OR2_PRELIM 0xfc006901 @@ -364,7 +361,6 @@ extern unsigned long get_clock_freq(void); #define CONFIG_LOADS_ECHO 1 /* echo on for serial download */ #define CONFIG_SYS_LOADS_BAUD_CHANGE 1 /* allow baudrate change */

- /* * BOOTP options */ @@ -373,7 +369,6 @@ extern unsigned long get_clock_freq(void); #define CONFIG_BOOTP_GATEWAY #define CONFIG_BOOTP_HOSTNAME

- /* * Command line configuration. */ @@ -385,7 +380,6 @@ extern unsigned long get_clock_freq(void); #define CONFIG_CMD_PCI #endif

- #undef CONFIG_WATCHDOG /* watchdog disabled */

/* @@ -459,14 +453,12 @@ extern unsigned long get_clock_freq(void); "ramargs=setenv bootargs root=/dev/ram rw " \ "console=$consoledev,$baudrate $othbootargs\0" \

- #define CONFIG_NFSBOOTCOMMAND \ "run nfsargs;" \ "tftp $loadaddr $bootfile;" \ "tftp $fdtaddr $fdtfile;" \ "bootm $loadaddr - $fdtaddr"

- #define CONFIG_RAMBOOTCOMMAND \ "run ramargs;" \ "tftp $ramdiskaddr $ramdiskfile;" \ diff --git a/include/configs/MPC8569MDS.h b/include/configs/MPC8569MDS.h index 51abcab..37156cb 100644 --- a/include/configs/MPC8569MDS.h +++ b/include/configs/MPC8569MDS.h @@ -463,7 +463,6 @@ extern unsigned long get_clock_freq(void); #define CONFIG_BOOTP_GATEWAY #define CONFIG_BOOTP_HOSTNAME

- /* * Command line configuration. */ @@ -475,7 +474,6 @@ extern unsigned long get_clock_freq(void); #define CONFIG_CMD_PCI #endif

- #undef CONFIG_WATCHDOG /* watchdog disabled */

#define CONFIG_MMC 1 diff --git a/include/configs/MPC8572DS.h b/include/configs/MPC8572DS.h index fe9d4cd..00db9b7 100644 --- a/include/configs/MPC8572DS.h +++ b/include/configs/MPC8572DS.h @@ -177,7 +177,6 @@ #define CONFIG_SYS_FLASH_BASE_PHYS CONFIG_SYS_FLASH_BASE #endif

- #define CONFIG_FLASH_BR_PRELIM \ (BR_PHYS_ADDR(CONFIG_SYS_FLASH_BASE_PHYS + 0x8000000) | BR_PS_16 | BR_V) #define CONFIG_FLASH_OR_PRELIM 0xf8000ff7 @@ -318,7 +317,6 @@ #define CONFIG_SYS_NAND_U_BOOT_RELOC (CONFIG_SYS_INIT_L2_END - 0x2000) #define CONFIG_SYS_NAND_U_BOOT_RELOC_SP ((CONFIG_SYS_INIT_L2_END - 1) & ~0xF)

- /* NAND flash config */ #define CONFIG_SYS_NAND_BR_PRELIM (BR_PHYS_ADDR(CONFIG_SYS_NAND_BASE_PHYS) \ | (2<<BR_DECC_SHIFT) /* Use HW ECC */ \ @@ -358,7 +356,6 @@ | BR_V) /* valid */ #define CONFIG_SYS_OR6_PRELIM CONFIG_SYS_NAND_OR_PRELIM /* NAND Options */

- /* Serial Port - controlled on board with jumper J8 * open - index 2 * shorted - index 1 @@ -509,7 +506,6 @@

#endif /* CONFIG_PCI */

- #if defined(CONFIG_TSEC_ENET)

#define CONFIG_MII 1 /* MII PHY management */ diff --git a/include/configs/MPC8610HPCD.h b/include/configs/MPC8610HPCD.h index b40d72f..b6539b8 100644 --- a/include/configs/MPC8610HPCD.h +++ b/include/configs/MPC8610HPCD.h @@ -20,7 +20,6 @@

#define CONFIG_SYS_TEXT_BASE 0xfff00000

- /* video */ #define CONFIG_FSL_DIU_FB

@@ -136,14 +135,12 @@

#endif

- #define CONFIG_ID_EEPROM #define CONFIG_SYS_I2C_EEPROM_NXID #define CONFIG_ID_EEPROM #define CONFIG_SYS_I2C_EEPROM_ADDR 0x57 #define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 1

- #define CONFIG_SYS_FLASH_BASE 0xf0000000 /* start of FLASH 128M */ #define CONFIG_SYS_FLASH_BASE2 0xf8000000

@@ -161,7 +158,6 @@ #define CONFIG_SYS_BR3_PRELIM 0xe8000801 /* port size 8bit */ #define CONFIG_SYS_OR3_PRELIM 0xfff06ff7 /* 1MB PIXIS area*/

- #define CONFIG_FSL_PIXIS 1 /* use common PIXIS code */ #define PIXIS_BASE 0xe8000000 /* PIXIS registers */ #define PIXIS_ID 0x0 /* Board ID at offset 0 */ @@ -277,7 +273,6 @@ #define CONFIG_SYS_PCIE2_IO_PHYS 0xe2000000 #define CONFIG_SYS_PCIE2_IO_SIZE 0x00100000 /* 1M */

- #if defined(CONFIG_PCI)

#define CONFIG_PCI_SCAN_SHOW /* show pci devices on startup */ @@ -386,7 +381,6 @@ #define CONFIG_SYS_IBAT4L (CONFIG_SYS_PCIE2_IO_PHYS | BATL_PP_RW | BATL_CACHEINHIBIT) #define CONFIG_SYS_IBAT4U CONFIG_SYS_DBAT4U

- /* * BAT5 128K Cacheable, non-guarded * 0xe400_0000 128K Init RAM for stack in the CPU DCache (no backing memory) @@ -424,7 +418,6 @@ #define CONFIG_SYS_IBAT7L (PIXIS_BASE | BATL_PP_RW | BATL_CACHEINHIBIT) #define CONFIG_SYS_IBAT7U CONFIG_SYS_DBAT7U

- /* * Environment */ @@ -442,7 +435,6 @@ #define CONFIG_LOADS_ECHO 1 /* echo on for serial download */ #define CONFIG_SYS_LOADS_BAUD_CHANGE 1 /* allow baudrate change */

- /* * BOOTP options */ @@ -451,7 +443,6 @@ #define CONFIG_BOOTP_GATEWAY #define CONFIG_BOOTP_HOSTNAME

- /* * Command line configuration. */ @@ -463,7 +454,6 @@ #define CONFIG_CMD_EXT2 #endif

- #define CONFIG_WATCHDOG /* watchdog enabled */ #define CONFIG_SYS_WATCHDOG_FREQ 5000 /* Feed interval, 5s */

diff --git a/include/configs/MPC8641HPCN.h b/include/configs/MPC8641HPCN.h index 6f70bd1..b2e2f36 100644 --- a/include/configs/MPC8641HPCN.h +++ b/include/configs/MPC8641HPCN.h @@ -134,7 +134,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy); #define SPD_EEPROM_ADDRESS3 0x53 /* CTLR 1 DIMM 0 */ #define SPD_EEPROM_ADDRESS4 0x54 /* CTLR 1 DIMM 1 */

- /* * These are used when DDR doesn't use SPD. */ @@ -359,7 +358,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy);

#define CONFIG_PCI_PNP /* do pci plug-and-play */

- #undef CONFIG_EEPRO100 #undef CONFIG_TULIP

@@ -440,7 +438,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy);

#endif /* CONFIG_TSEC_ENET */

- #ifdef CONFIG_PHYS_64BIT #define PHYS_HIGH_TO_BXPN(x) ((x & 0x0000000e) << 8) #define PHYS_HIGH_TO_BX(x) ((x & 0x00000001) << 2) @@ -600,7 +597,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy); #define CONFIG_LOADS_ECHO 1 /* echo on for serial download */ #define CONFIG_SYS_LOADS_BAUD_CHANGE 1 /* allow baudrate change */

- /* * BOOTP options */ @@ -609,7 +605,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy); #define CONFIG_BOOTP_GATEWAY #define CONFIG_BOOTP_HOSTNAME

- /* * Command line configuration. */ @@ -621,7 +616,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy); #define CONFIG_CMD_EXT2 #endif

- #undef CONFIG_WATCHDOG /* watchdog disabled */

/* @@ -703,7 +697,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy); "dis-wd=mw.b ffdf0010 0x00; echo -expect:- 00; md.b ffdf0010 1\0" \ "maxcpus=2"

- #define CONFIG_NFSBOOTCOMMAND \ "setenv bootargs root=/dev/nfs rw " \ "nfsroot=$serverip:$rootpath " \ diff --git a/include/configs/P1010RDB.h b/include/configs/P1010RDB.h index fcb1644..87726a4 100644 --- a/include/configs/P1010RDB.h +++ b/include/configs/P1010RDB.h @@ -185,7 +185,6 @@

#define CONFIG_CMD_PCI

- /* * PCI Windows * Memory space is mapped 1-1, but I/O space must start from 0. @@ -699,7 +698,6 @@ extern unsigned long get_sdram_size(void);

#endif /* CONFIG_TSEC_ENET */

- /* SATA */ #define CONFIG_FSL_SATA #define CONFIG_FSL_SATA_V2 diff --git a/include/configs/P1022DS.h b/include/configs/P1022DS.h index 5272878..5a7bef9 100644 --- a/include/configs/P1022DS.h +++ b/include/configs/P1022DS.h @@ -172,7 +172,6 @@ #define CONFIG_SYS_CCSR_DO_NOT_RELOCATE #endif

- /* DDR Setup */ #define CONFIG_DDR_SPD #define CONFIG_VERY_BIG_RAM @@ -217,7 +216,6 @@ #define CONFIG_SYS_DDR_ZQ_CONTROL 0x89080600 #define CONFIG_SYS_DDR_WRLVL_CONTROL 0x8675f608

- /* * Memory map * diff --git a/include/configs/PATI.h b/include/configs/PATI.h index 81d535f..9f3c037 100644 --- a/include/configs/PATI.h +++ b/include/configs/PATI.h @@ -21,14 +21,12 @@

#define CONFIG_SYS_TEXT_BASE 0xFFF00000

- /* Serial Console Configuration */ #define CONFIG_5xx_CONS_SCI1 #undef CONFIG_5xx_CONS_SCI2

#define CONFIG_BAUDRATE 9600

- /* * BOOTP options */ @@ -37,7 +35,6 @@ #define CONFIG_BOOTP_GATEWAY #define CONFIG_BOOTP_HOSTNAME

- /* * Command line configuration. */ @@ -47,7 +44,6 @@ #define CONFIG_CMD_EEPROM #define CONFIG_CMD_IRQ

- #if 0 #define CONFIG_BOOTDELAY -1 /* autoboot disabled */ #else @@ -135,7 +131,6 @@ */ #define CONFIG_SYS_BOOTMAPSZ (8 << 20) /* Initial Memory map for Linux */

- /*----------------------------------------------------------------------- * FLASH organization *----------------------------------------------------------------------- @@ -165,7 +160,6 @@ #define CONFIG_ENV_OFFSET ((0 - CONFIG_SYS_FLASH_BASE) - CONFIG_ENV_SIZE) /* Environment starts at this adress */ #endif

- #define CONFIG_SPI 1 #define CONFIG_SYS_SPI_CS_USED 0x09 /* CS0 and CS3 are used */ #define CONFIG_SYS_SPI_CS_BASE 0x08 /* CS3 is active low */ @@ -224,7 +218,6 @@ */ #define CONFIG_SYS_OSC_CLK ((uint)4000000) /* Oscillator clock is 4MHz */

- #define CONFIG_SYS_PLPRCR (PLPRCR_MF_9 | PLPRCR_DIVF_0)

/*----------------------------------------------------------------------- diff --git a/include/configs/PIP405.h b/include/configs/PIP405.h index 5290208..7d7e2d0 100644 --- a/include/configs/PIP405.h +++ b/include/configs/PIP405.h @@ -21,13 +21,11 @@

#define CONFIG_SYS_TEXT_BASE 0xFFF80000

- /*********************************************************** * Clock ***********************************************************/ #define CONFIG_SYS_CLK_FREQ 33000000 /* external frequency to pll */

- /* * BOOTP options */ @@ -36,7 +34,6 @@ #define CONFIG_BOOTP_GATEWAY #define CONFIG_BOOTP_HOSTNAME

- /* * Command line configuration. */ @@ -81,7 +78,6 @@ /* last 6 bits of the address */ #define CONFIG_SYS_EEPROM_PAGE_WRITE_DELAY_MS 10 /* and takes up to 10 msec */

- /*************************************************************** * Definitions for Serial Presence Detect EEPROM address * (to get SDRAM settings) @@ -96,13 +92,11 @@ **************************************************************/ #define CONFIG_BAUDRATE 9600 /* STD Baudrate */

- #define CONFIG_BOOTDELAY 5 /* autoboot (do NOT change this set environment variable "bootdelay" to -1 instead) */ /* #define CONFIG_BOOT_RETRY_TIME -10 /XXX* feature is available but not enabled */ #define CONFIG_ZERO_BOOTDELAY_CHECK /* check console even if bootdelay = 0 */

- #define CONFIG_BOOTCOMMAND "diskboot 400000 0:1; bootm" /* autoboot command */ #define CONFIG_BOOTARGS "console=ttyS0,9600 root=/dev/hda5" /* boot arguments */

@@ -231,7 +225,6 @@ #define CONFIG_PORT_ADDR 0xF4000000 #define MULTI_PURPOSE_SOCKET_ADDR 0xF8000000

- /*----------------------------------------------------------------------- * Definitions for initial stack pointer and data area (in On Chip SRAM) */ @@ -353,5 +346,4 @@ #define CONFIG_ISO_STRING "MEV-10066-001" #define CONFIG_IDENT_STRING "\n(c) 2002 by MPL AG Switzerland, " CONFIG_ISO_STRING " " VERSION_TAG

- #endif /* __CONFIG_H */ diff --git a/include/configs/PLU405.h b/include/configs/PLU405.h index c775100..a868ec9 100644 --- a/include/configs/PLU405.h +++ b/include/configs/PLU405.h @@ -47,7 +47,6 @@

#define CONFIG_PHY_CLK_FREQ EMAC_STACR_CLK_66MHZ /* 66 MHz OPB clock*/

- /* * BOOTP options */ @@ -56,7 +55,6 @@ #define CONFIG_BOOTP_GATEWAY #define CONFIG_BOOTP_HOSTNAME

- /* * Command line configuration. */ @@ -86,7 +84,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 diff --git a/include/configs/PMC405DE.h b/include/configs/PMC405DE.h index a4d7bee..03c8fb9 100644 --- a/include/configs/PMC405DE.h +++ b/include/configs/PMC405DE.h @@ -158,7 +158,6 @@ #define CONFIG_SYS_FLASH_EMPTY_INFO 1 /* 'E' for empty sector (flinfo) */ #define CONFIG_SYS_FLASH_QUIET_TEST 1 /* don't warn upon unknown flash */

- /* * Start addresses for the final memory configuration * (Set up by the startup code) diff --git a/include/configs/PMC440.h b/include/configs/PMC440.h index f69eee6..e5555cc 100644 --- a/include/configs/PMC440.h +++ b/include/configs/PMC440.h @@ -158,7 +158,6 @@ #define CONFIG_SYS_I2C_PPC4XX_SPEED_1 400000 #define CONFIG_SYS_I2C_PPC4XX_SLAVE_1 0x7F

- #define CONFIG_SYS_I2C_EEPROM_ADDR 0x54 #define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 2 #define CONFIG_SYS_EEPROM_PAGE_WRITE_BITS 5 diff --git a/include/configs/T102xQDS.h b/include/configs/T102xQDS.h index 90572f4..22f42f0 100644 --- a/include/configs/T102xQDS.h +++ b/include/configs/T102xQDS.h @@ -202,7 +202,6 @@ #define CONFIG_ENV_SECT_SIZE 0x20000 /* 128K (one sector) */ #endif

- #ifndef __ASSEMBLY__ unsigned long get_board_sys_clk(void); unsigned long get_board_ddr_clk(void); @@ -879,7 +878,6 @@ unsigned long get_board_ddr_clk(void); #define CONFIG_BAUDRATE 115200 #define __USB_PHY_TYPE utmi

- #define CONFIG_EXTRA_ENV_SETTINGS \ "hwconfig=fsl_ddr:ctlr_intlv=cacheline,bank_intlv=cs0_cs1;\0" \ "usb1:dr_mode=host,phy_type=" __stringify(__USB_PHY_TYPE) "\0" \ diff --git a/include/configs/T102xRDB.h b/include/configs/T102xRDB.h index 846ad39..7b6625f 100644 --- a/include/configs/T102xRDB.h +++ b/include/configs/T102xRDB.h @@ -217,7 +217,6 @@ #define CONFIG_ENV_SECT_SIZE 0x20000 /* 128K (one sector) */ #endif

- #ifndef __ASSEMBLY__ unsigned long get_board_sys_clk(void); unsigned long get_board_ddr_clk(void); @@ -916,7 +915,6 @@ unsigned long get_board_ddr_clk(void); "setenv loadaddr 0x1000000;" \ "bootm $loadaddr $ramdiskaddr $fdtaddr"

- #define CONFIG_NFSBOOTCOMMAND \ "setenv bootargs root=/dev/nfs rw " \ "nfsroot=$serverip:$rootpath " \ diff --git a/include/configs/T1040QDS.h b/include/configs/T1040QDS.h index 04c564f..da06bfd 100644 --- a/include/configs/T1040QDS.h +++ b/include/configs/T1040QDS.h @@ -450,7 +450,6 @@ unsigned long get_board_ddr_clk(void); #define I2C_MUX_PCA_ADDR 0x77 #define I2C_MUX_PCA_ADDR_PRI 0x77 /* Primary Mux*/

- /* I2C bus multiplexer */ #define I2C_MUX_CH_DEFAULT 0x8 #define I2C_MUX_CH_DIU 0xC diff --git a/include/configs/T104xRDB.h b/include/configs/T104xRDB.h index 1e61ec9..e58691b 100644 --- a/include/configs/T104xRDB.h +++ b/include/configs/T104xRDB.h @@ -709,7 +709,6 @@ $(SRCTREE)/board/freescale/t104xrdb/t1042d4_rcw.cfg #endif #endif

- #define CONFIG_SYS_QE_FMAN_FW_LENGTH 0x10000 #define CONFIG_SYS_FDT_PAD (0x3000 + CONFIG_SYS_QE_FMAN_FW_LENGTH) #endif /* CONFIG_NOBQFMAN */ diff --git a/include/configs/T208xQDS.h b/include/configs/T208xQDS.h index b1bd4fd..6f81368 100644 --- a/include/configs/T208xQDS.h +++ b/include/configs/T208xQDS.h @@ -744,7 +744,6 @@ unsigned long get_board_ddr_clk(void); #define CONFIG_FSL_ESDHC_ADAPTER_IDENT #endif

- /* * Dynamic MTD Partition support with mtdparts */ diff --git a/include/configs/T208xRDB.h b/include/configs/T208xRDB.h index dc6e211..508c896 100644 --- a/include/configs/T208xRDB.h +++ b/include/configs/T208xRDB.h @@ -652,7 +652,6 @@ unsigned long get_board_ddr_clk(void); #define FM1_10GEC4_PHY_ADDR 0x01 #endif

- #ifdef CONFIG_FMAN_ENET #define CONFIG_MII /* MII PHY management */ #define CONFIG_ETHPRIME "FM1@DTSEC3" diff --git a/include/configs/T4240QDS.h b/include/configs/T4240QDS.h index af5855c..1ff6309 100644 --- a/include/configs/T4240QDS.h +++ b/include/configs/T4240QDS.h @@ -343,7 +343,6 @@ unsigned long get_board_ddr_clk(void); #define CONFIG_SYS_RAMBOOT #endif

- /* I2C */ #define CONFIG_SYS_FSL_I2C_SPEED 100000 /* I2C speed */ #define CONFIG_SYS_FSL_I2C2_SPEED 100000 /* I2C2 speed */ @@ -404,7 +403,6 @@ unsigned long get_board_ddr_clk(void); #define CONFIG_SF_DEFAULT_SPEED 10000000 #define CONFIG_SF_DEFAULT_MODE 0

- /* Qman/Bman */ #ifndef CONFIG_NOBQFMAN #define CONFIG_SYS_DPAA_QBMAN /* Support Q/Bman */ @@ -492,7 +490,6 @@ unsigned long get_board_ddr_clk(void); #define FM2_10GEC2_PHY_ADDR 0x3 #endif

- /* SATA */ #ifdef CONFIG_FSL_SATA_V2 #define CONFIG_LIBATA diff --git a/include/configs/T4240RDB.h b/include/configs/T4240RDB.h index 2b50594..495c09c 100644 --- a/include/configs/T4240RDB.h +++ b/include/configs/T4240RDB.h @@ -154,14 +154,12 @@ #define CONFIG_DDR_SPD #define CONFIG_SYS_FSL_DDR3

- /* * IFC Definitions */ #define CONFIG_SYS_FLASH_BASE 0xe0000000 #define CONFIG_SYS_FLASH_BASE_PHYS (0xf00000000ull | CONFIG_SYS_FLASH_BASE)

- #ifdef CONFIG_SPL_BUILD #define CONFIG_SYS_MONITOR_BASE CONFIG_SPL_TEXT_BASE #else @@ -349,7 +347,6 @@ /* default location for tftp and bootm */ #define CONFIG_LOADADDR 1000000

- #define CONFIG_BAUDRATE 115200

#define CONFIG_HVBOOT \ @@ -572,7 +569,6 @@ unsigned long get_board_ddr_clk(void); #define CONFIG_SYS_RAMBOOT #endif

- /* I2C */ #define CONFIG_SYS_FSL_I2C_SPEED 100000 /* I2C speed */ #define CONFIG_SYS_FSL_I2C2_SPEED 100000 /* I2C2 speed */ @@ -606,7 +602,6 @@ unsigned long get_board_ddr_clk(void); #define CONFIG_SF_DEFAULT_SPEED 10000000 #define CONFIG_SF_DEFAULT_MODE 0

- /* Qman/Bman */ #ifndef CONFIG_NOBQFMAN #define CONFIG_SYS_DPAA_QBMAN /* Support Q/Bman */ @@ -696,7 +691,6 @@ unsigned long get_board_ddr_clk(void); #define CORTINA_PHY_ADDR4 FM2_10GEC2_PHY_ADDR #endif

- /* SATA */ #ifdef CONFIG_FSL_SATA_V2 #define CONFIG_LIBATA diff --git a/include/configs/TQM5200.h b/include/configs/TQM5200.h index 516acd3..d542d2a 100644 --- a/include/configs/TQM5200.h +++ b/include/configs/TQM5200.h @@ -117,7 +117,6 @@ #define CONFIG_SYS_CONSOLE_IS_IN_ENV #endif /* #ifndef CONFIG_TQM5200S */

- /* Partitions */ #define CONFIG_MAC_PARTITION #define CONFIG_DOS_PARTITION @@ -151,7 +150,6 @@ #define MPC5XXX_SRAM_POST_SIZE MPC5XXX_SRAM_SIZE-4 #endif

- /* * BOOTP options */ @@ -160,7 +158,6 @@ #define CONFIG_BOOTP_GATEWAY #define CONFIG_BOOTP_HOSTNAME

- /* * Command line configuration. */ @@ -198,7 +195,6 @@ #define CONFIG_CMD_DIAG #endif

- #define CONFIG_TIMESTAMP /* display image timestamps */

#if (CONFIG_SYS_TEXT_BASE != 0xFFF00000) @@ -485,7 +481,6 @@ #define CONFIG_SYS_INIT_RAM_SIZE MPC5XXX_SRAM_SIZE #endif

- #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

diff --git a/include/configs/TQM823L.h b/include/configs/TQM823L.h index 474ab5f..304dc09 100644 --- a/include/configs/TQM823L.h +++ b/include/configs/TQM823L.h @@ -95,13 +95,11 @@ #define CONFIG_BOOTP_BOOTPATH #define CONFIG_BOOTP_BOOTFILESIZE

- #define CONFIG_MAC_PARTITION #define CONFIG_DOS_PARTITION

#define CONFIG_RTC_MPC8xx /* use internal RTC of MPC8xx */

- /* * Command line configuration. */ @@ -115,7 +113,6 @@ #define CONFIG_CMD_BMP #endif

- #define CONFIG_NETCONSOLE

/* diff --git a/include/configs/TQM823M.h b/include/configs/TQM823M.h index 98b900a..72cd1e4 100644 --- a/include/configs/TQM823M.h +++ b/include/configs/TQM823M.h @@ -93,13 +93,11 @@ #define CONFIG_BOOTP_BOOTPATH #define CONFIG_BOOTP_BOOTFILESIZE

- #define CONFIG_MAC_PARTITION #define CONFIG_DOS_PARTITION

#define CONFIG_RTC_MPC8xx /* use internal RTC of MPC8xx */

- /* * Command line configuration. */ diff --git a/include/configs/TQM834x.h b/include/configs/TQM834x.h index 2becc46..24ed057 100644 --- a/include/configs/TQM834x.h +++ b/include/configs/TQM834x.h @@ -282,7 +282,6 @@ #define CONFIG_BOOTP_GATEWAY #define CONFIG_BOOTP_HOSTNAME

- /* * Command line configuration. */ @@ -307,7 +306,6 @@ #define CONFIG_CMDLINE_EDITING 1 /* add command line history */ #define CONFIG_AUTO_COMPLETE /* add autocompletion support */

- #if defined(CONFIG_CMD_KGDB) #define CONFIG_SYS_CBSIZE 1024 /* Console I/O Buffer Size */ #else diff --git a/include/configs/TQM850L.h b/include/configs/TQM850L.h index 8b57f08..2ed1539 100644 --- a/include/configs/TQM850L.h +++ b/include/configs/TQM850L.h @@ -84,7 +84,6 @@ #define CONFIG_BOOTP_BOOTPATH #define CONFIG_BOOTP_BOOTFILESIZE

- #define CONFIG_MAC_PARTITION #define CONFIG_DOS_PARTITION

diff --git a/include/configs/TQM850M.h b/include/configs/TQM850M.h index 40c60fc..469cd3f 100644 --- a/include/configs/TQM850M.h +++ b/include/configs/TQM850M.h @@ -84,7 +84,6 @@ #define CONFIG_BOOTP_BOOTPATH #define CONFIG_BOOTP_BOOTFILESIZE

- #define CONFIG_MAC_PARTITION #define CONFIG_DOS_PARTITION

@@ -99,10 +98,8 @@ #define CONFIG_CMD_IDE #define CONFIG_CMD_JFFS2

- #define CONFIG_NETCONSOLE

- /* * Miscellaneous configurable options */ diff --git a/include/configs/TQM855L.h b/include/configs/TQM855L.h index cae97c6..eb0077b 100644 --- a/include/configs/TQM855L.h +++ b/include/configs/TQM855L.h @@ -86,13 +86,11 @@ #define CONFIG_BOOTP_BOOTPATH #define CONFIG_BOOTP_BOOTFILESIZE

- #define CONFIG_MAC_PARTITION #define CONFIG_DOS_PARTITION

#define CONFIG_RTC_MPC8xx /* use internal RTC of MPC8xx */

- /* * Command line configuration. */ diff --git a/include/configs/TQM855M.h b/include/configs/TQM855M.h index e6868ef..b504713 100644 --- a/include/configs/TQM855M.h +++ b/include/configs/TQM855M.h @@ -115,13 +115,11 @@ #define CONFIG_BOOTP_BOOTPATH #define CONFIG_BOOTP_BOOTFILESIZE

- #define CONFIG_MAC_PARTITION #define CONFIG_DOS_PARTITION

#define CONFIG_RTC_MPC8xx /* use internal RTC of MPC8xx */

- /* * Command line configuration. */ diff --git a/include/configs/TQM860L.h b/include/configs/TQM860L.h index 25ce29b..dfddd03 100644 --- a/include/configs/TQM860L.h +++ b/include/configs/TQM860L.h @@ -86,13 +86,11 @@ #define CONFIG_BOOTP_BOOTPATH #define CONFIG_BOOTP_BOOTFILESIZE

- #define CONFIG_MAC_PARTITION #define CONFIG_DOS_PARTITION

#define CONFIG_RTC_MPC8xx /* use internal RTC of MPC8xx */

- /* * Command line configuration. */ diff --git a/include/configs/TQM860M.h b/include/configs/TQM860M.h index 117d1e4..2733849 100644 --- a/include/configs/TQM860M.h +++ b/include/configs/TQM860M.h @@ -86,13 +86,11 @@ #define CONFIG_BOOTP_BOOTPATH #define CONFIG_BOOTP_BOOTFILESIZE

- #define CONFIG_MAC_PARTITION #define CONFIG_DOS_PARTITION

#define CONFIG_RTC_MPC8xx /* use internal RTC of MPC8xx */

- /* * Command line configuration. */ diff --git a/include/configs/TQM862L.h b/include/configs/TQM862L.h index bb61986b..9f09319 100644 --- a/include/configs/TQM862L.h +++ b/include/configs/TQM862L.h @@ -89,13 +89,11 @@ #define CONFIG_BOOTP_BOOTPATH #define CONFIG_BOOTP_BOOTFILESIZE

- #define CONFIG_MAC_PARTITION #define CONFIG_DOS_PARTITION

#define CONFIG_RTC_MPC8xx /* use internal RTC of MPC8xx */

- /* * Command line configuration. */ diff --git a/include/configs/TQM862M.h b/include/configs/TQM862M.h index ff473e9..e76cb64 100644 --- a/include/configs/TQM862M.h +++ b/include/configs/TQM862M.h @@ -89,13 +89,11 @@ #define CONFIG_BOOTP_BOOTPATH #define CONFIG_BOOTP_BOOTFILESIZE

- #define CONFIG_MAC_PARTITION #define CONFIG_DOS_PARTITION

#define CONFIG_RTC_MPC8xx /* use internal RTC of MPC8xx */

- /* * Command line configuration. */ diff --git a/include/configs/TQM866M.h b/include/configs/TQM866M.h index 78cf804..0d84ac7 100644 --- a/include/configs/TQM866M.h +++ b/include/configs/TQM866M.h @@ -127,7 +127,6 @@ #define CONFIG_BOOTP_BOOTPATH #define CONFIG_BOOTP_BOOTFILESIZE

- #define CONFIG_MAC_PARTITION #define CONFIG_DOS_PARTITION

@@ -135,7 +134,6 @@

#define CONFIG_TIMESTAMP /* but print image timestmps */

- /* * Command line configuration. */ diff --git a/include/configs/VCMA9.h b/include/configs/VCMA9.h index 0b6e3f3..5d7874b 100644 --- a/include/configs/VCMA9.h +++ b/include/configs/VCMA9.h @@ -13,7 +13,6 @@ #ifndef __CONFIG_H #define __CONFIG_H

- #define MACH_TYPE_MPL_VCMA9 227

/* @@ -29,7 +28,6 @@

#define CONFIG_SYS_TEXT_BASE 0x0

- #define CONFIG_SYS_ARM_CACHE_WRITETHROUGH

/* input clock of PLL (VCMA9 has 12MHz input clock) */ @@ -113,7 +111,6 @@ /* RTC */ #define CONFIG_RTC_S3C24X0

- /* allow to overwrite serial and ethaddr */ #define CONFIG_ENV_OVERWRITE

diff --git a/include/configs/VOM405.h b/include/configs/VOM405.h index e2aa578..405ac0d 100644 --- a/include/configs/VOM405.h +++ b/include/configs/VOM405.h @@ -74,7 +74,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 diff --git a/include/configs/a3m071.h b/include/configs/a3m071.h index f44a20c..47e35c5 100644 --- a/include/configs/a3m071.h +++ b/include/configs/a3m071.h @@ -230,7 +230,6 @@ * +- 31 0 PSC1 */

- /* * Miscellaneous configurable options */ diff --git a/include/configs/a4m072.h b/include/configs/a4m072.h index c6a8553..09216d1 100644 --- a/include/configs/a4m072.h +++ b/include/configs/a4m072.h @@ -88,7 +88,6 @@ #define CONFIG_BOOTP_GATEWAY #define CONFIG_BOOTP_HOSTNAME

- /* * Command line configuration. */ @@ -222,7 +221,6 @@ #define CONFIG_SYS_INIT_RAM_ADDR MPC5XXX_SRAM #define CONFIG_SYS_INIT_RAM_SIZE MPC5XXX_SRAM_SIZE /* Size of used area in DPRAM */

- #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

@@ -276,7 +274,6 @@ # define CONFIG_SYS_CACHELINE_SHIFT 5 /* log base 2 of the above value */ #endif

- /* * Various low-level settings */ diff --git a/include/configs/ac14xx.h b/include/configs/ac14xx.h index 8c60f10..efd63a0 100644 --- a/include/configs/ac14xx.h +++ b/include/configs/ac14xx.h @@ -342,7 +342,6 @@ CLOCK_SCCR2_DIU_EN | \ CLOCK_SCCR2_I2C_EN)

- #define CONFIG_CMDLINE_EDITING 1 /* command line history */

/* I2C */ diff --git a/include/configs/am3517_crane.h b/include/configs/am3517_crane.h index cd6e0fd..cbfe1bd 100644 --- a/include/configs/am3517_crane.h +++ b/include/configs/am3517_crane.h @@ -134,7 +134,6 @@ #define CONFIG_CMD_MMC /* MMC support */ #define CONFIG_CMD_NAND /* NAND support */

- #define CONFIG_SYS_NO_FLASH #define CONFIG_SYS_I2C #define CONFIG_SYS_OMAP24_I2C_SPEED 100000 diff --git a/include/configs/amcc-common.h b/include/configs/amcc-common.h index f97988c..89093bd 100644 --- a/include/configs/amcc-common.h +++ b/include/configs/amcc-common.h @@ -10,7 +10,6 @@ #ifndef __AMCC_COMMON_H #define __AMCC_COMMON_H

- #define CONFIG_SYS_SDRAM_BASE 0x00000000 /* _must_ be 0 */ #define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE /* Start of U-Boot */ #define CONFIG_SYS_MONITOR_LEN (0xFFFFFFFF - CONFIG_SYS_MONITOR_BASE + 1) @@ -88,7 +87,6 @@ #define CONFIG_VERSION_VARIABLE /* include version env variable */ #define CONFIG_SYS_CONSOLE_INFO_QUIET /* don't print console @ startup*/

- #define CONFIG_LOADS_ECHO /* echo on for serial download */ #define CONFIG_SYS_LOADS_BAUD_CHANGE /* allow baudrate change */

diff --git a/include/configs/apf27.h b/include/configs/apf27.h index f0e88ee..f8c91f8 100644 --- a/include/configs/apf27.h +++ b/include/configs/apf27.h @@ -147,7 +147,6 @@ #define CONFIG_ENV_VARS_UBOOT_CONFIG #define CONFIG_PREBOOT "run check_flash check_env;"

- /* * Boot Linux */ diff --git a/include/configs/apx4devkit.h b/include/configs/apx4devkit.h index fc7a35e..1f7ef8f 100644 --- a/include/configs/apx4devkit.h +++ b/include/configs/apx4devkit.h @@ -38,7 +38,6 @@ #define PHYS_SDRAM_1_SIZE 0x20000000 /* Max 512 MB RAM */ #define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM_1

- /* Environment */ #define CONFIG_ENV_OVERWRITE #define CONFIG_ENV_IS_IN_NAND @@ -92,7 +91,6 @@ #define CONFIG_USB_STORAGE #endif

- /* RTC */ #ifdef CONFIG_CMD_DATE #define CONFIG_RTC_PCF8563 diff --git a/include/configs/astro_mcf5373l.h b/include/configs/astro_mcf5373l.h index f7fa058..6660eb0 100644 --- a/include/configs/astro_mcf5373l.h +++ b/include/configs/astro_mcf5373l.h @@ -68,7 +68,6 @@ #define CONFIG_CMD_FPGA_LOADMK #define CONFIG_CMDLINE_EDITING

- #define CONFIG_MCFRTC #undef RTC_DEBUG

diff --git a/include/configs/at91rm9200ek.h b/include/configs/at91rm9200ek.h index 0d98a44..ee3712c 100644 --- a/include/configs/at91rm9200ek.h +++ b/include/configs/at91rm9200ek.h @@ -60,7 +60,6 @@

#define CONFIG_CMD_BOOTZ

- /* * Memory Configuration */ diff --git a/include/configs/at91sam9rlek.h b/include/configs/at91sam9rlek.h index 126b8d4..6a03923 100644 --- a/include/configs/at91sam9rlek.h +++ b/include/configs/at91sam9rlek.h @@ -61,7 +61,6 @@ #undef CONFIG_FB_ADDR #define CONFIG_SYS_CONSOLE_IS_IN_ENV 1

- /* LED */ #define CONFIG_AT91_LED #define CONFIG_RED_LED AT91_PIN_PD14 /* this is the power led */ diff --git a/include/configs/at91sam9x5ek.h b/include/configs/at91sam9x5ek.h index a4d9cb8..fd87bb7 100644 --- a/include/configs/at91sam9x5ek.h +++ b/include/configs/at91sam9x5ek.h @@ -74,7 +74,6 @@ * NB: in this case, USB 1.1 devices won't be recognized. */

- /* SDRAM */ #define CONFIG_NR_DRAM_BANKS 1 #define CONFIG_SYS_SDRAM_BASE 0x20000000 diff --git a/include/configs/atngw100.h b/include/configs/atngw100.h index 4118cac..a18a2c9 100644 --- a/include/configs/atngw100.h +++ b/include/configs/atngw100.h @@ -86,7 +86,6 @@ #define CONFIG_CMD_JFFS2 #define CONFIG_CMD_MMC

- #define CONFIG_ATMEL_USART #define CONFIG_MACB #define CONFIG_PORTMUX_PIO @@ -97,7 +96,6 @@ #define CONFIG_GENERIC_MMC #define CONFIG_ATMEL_SPI

- #define CONFIG_SYS_DCACHE_LINESZ 32 #define CONFIG_SYS_ICACHE_LINESZ 32

diff --git a/include/configs/atngw100mkii.h b/include/configs/atngw100mkii.h index dd4e1a3..09e193e 100644 --- a/include/configs/atngw100mkii.h +++ b/include/configs/atngw100mkii.h @@ -106,7 +106,6 @@ #define CONFIG_CMD_MMC #define CONFIG_CMD_MII

- #define CONFIG_ATMEL_USART #define CONFIG_MACB #define CONFIG_PORTMUX_PIO @@ -117,7 +116,6 @@ #define CONFIG_GENERIC_MMC #define CONFIG_ATMEL_SPI

- #define CONFIG_SYS_DCACHE_LINESZ 32 #define CONFIG_SYS_ICACHE_LINESZ 32

diff --git a/include/configs/atstk1002.h b/include/configs/atstk1002.h index 2d34077..62f01a7 100644 --- a/include/configs/atstk1002.h +++ b/include/configs/atstk1002.h @@ -107,7 +107,6 @@ #define CONFIG_CMD_JFFS2 #define CONFIG_CMD_MMC

- #define CONFIG_ATMEL_USART #define CONFIG_MACB #define CONFIG_PORTMUX_PIO diff --git a/include/configs/baltos.h b/include/configs/baltos.h index 560dc88..27ab8f7 100644 --- a/include/configs/baltos.h +++ b/include/configs/baltos.h @@ -198,7 +198,6 @@ "run mmcboot;" \ "run nandboot;"

- /* NS16550 Configuration */ #define CONFIG_SYS_NS16550_COM1 0x44e09000 /* Base EVM has UART0 */ #define CONFIG_SYS_NS16550_COM2 0x48022000 /* UART1 */ diff --git a/include/configs/bct-brettl2.h b/include/configs/bct-brettl2.h index 4563c54..e95deac 100644 --- a/include/configs/bct-brettl2.h +++ b/include/configs/bct-brettl2.h @@ -7,14 +7,12 @@

#include <asm/config-pre.h>

- /* * Processor Settings */ #define CONFIG_BFIN_CPU bf536-0.3 #define CONFIG_BFIN_BOOT_MODE BFIN_BOOT_BYPASS

- /* * Clock Settings * CCLK = (CLKIN * VCO_MULT) / CCLK_DIV @@ -39,14 +37,12 @@ #define CONFIG_SCLK_DIV 3 #define CONFIG_VR_CTL_VAL (VLEV_110 | GAIN_20 | FREQ_1000)

- /* * Memory Settings */ #define CONFIG_MEM_ADD_WDTH 9 #define CONFIG_MEM_SIZE 32

- /* * SDRAM Settings */ @@ -60,7 +56,6 @@ #define CONFIG_SYS_MONITOR_LEN (256 * 1024) #define CONFIG_SYS_MALLOC_LEN (128 * 1024)

- /* * Network Settings */ @@ -75,7 +70,6 @@ #define CONFIG_ROOTPATH "/romfs/brettl2" #endif

- /* * Flash Settings */ @@ -87,7 +81,6 @@ #define CONFIG_SYS_MAX_FLASH_BANKS 1 #define CONFIG_SYS_MAX_FLASH_SECT 135

- /* * Env Storage Settings */ @@ -115,14 +108,12 @@ common/env_embedded.o (.text*); #endif

- /* * I2C Settings */ #define CONFIG_SYS_I2C #define CONFIG_SYS_I2C_ADI

- /* * Misc Settings */ diff --git a/include/configs/bf506f-ezkit.h b/include/configs/bf506f-ezkit.h index 8be2ecb..dc7d83f 100644 --- a/include/configs/bf506f-ezkit.h +++ b/include/configs/bf506f-ezkit.h @@ -7,14 +7,12 @@

#include <asm/config-pre.h>

- /* * Processor Settings */ #define CONFIG_BFIN_CPU bf506-0.0 #define CONFIG_BFIN_BOOT_MODE BFIN_BOOT_PARA

- /* * Clock Settings * CCLK = (CLKIN * VCO_MULT) / CCLK_DIV @@ -38,7 +36,6 @@ /* Values can range from 1-15 */ #define CONFIG_SCLK_DIV 5

- /* * Memory Settings */ @@ -52,7 +49,6 @@ #define CONFIG_SYS_MONITOR_LEN (4 * 1024) #define CONFIG_SYS_MALLOC_LEN (4 * 1024)

- /* * Flash Settings */ @@ -79,7 +75,6 @@ #define CONFIG_ENV_IS_NOWHERE #define CONFIG_ENV_SIZE 0x400

- /* * Misc Settings */ diff --git a/include/configs/bf518f-ezbrd.h b/include/configs/bf518f-ezbrd.h index 9f44ebd..510cd47 100644 --- a/include/configs/bf518f-ezbrd.h +++ b/include/configs/bf518f-ezbrd.h @@ -7,14 +7,12 @@

#include <asm/config-pre.h>

- /* * Processor Settings */ #define CONFIG_BFIN_CPU bf518-0.0 #define CONFIG_BFIN_BOOT_MODE BFIN_BOOT_PARA

- /* * Clock Settings * CCLK = (CLKIN * VCO_MULT) / CCLK_DIV @@ -38,7 +36,6 @@ /* Values can range from 1-15 */ #define CONFIG_SCLK_DIV 5

- /* * Memory Settings */ @@ -56,7 +53,6 @@ #define CONFIG_SYS_MONITOR_LEN (512 * 1024) #define CONFIG_SYS_MALLOC_LEN (384 * 1024)

- /* * Network Settings */ @@ -98,7 +94,6 @@ #define CONFIG_SYS_MAX_FLASH_BANKS 1 #define CONFIG_SYS_MAX_FLASH_SECT 71

- /* * SPI Settings */ @@ -106,7 +101,6 @@ #define CONFIG_ENV_SPI_MAX_HZ 30000000 #define CONFIG_SF_DEFAULT_SPEED 30000000

- /* * Env Storage Settings */ @@ -124,14 +118,12 @@ #endif #define CONFIG_ENV_IS_EMBEDDED_IN_LDR

- /* * I2C Settings */ #define CONFIG_SYS_I2C #define CONFIG_SYS_I2C_ADI

- /* * SDH Settings */ @@ -141,7 +133,6 @@ #define CONFIG_BFIN_SDH #endif

- /* * Misc Settings */ diff --git a/include/configs/bf526-ezbrd.h b/include/configs/bf526-ezbrd.h index e9d900e..74c3464 100644 --- a/include/configs/bf526-ezbrd.h +++ b/include/configs/bf526-ezbrd.h @@ -7,14 +7,12 @@

#include <asm/config-pre.h>

- /* * Processor Settings */ #define CONFIG_BFIN_CPU bf526-0.0 #define CONFIG_BFIN_BOOT_MODE BFIN_BOOT_PARA

- /* * Clock Settings * CCLK = (CLKIN * VCO_MULT) / CCLK_DIV @@ -38,7 +36,6 @@ /* Values can range from 1-15 */ #define CONFIG_SCLK_DIV 5

- /* * Memory Settings */ @@ -56,7 +53,6 @@ #define CONFIG_SYS_MONITOR_LEN (768 * 1024) #define CONFIG_SYS_MALLOC_LEN (512 * 1024)

- /* * NAND Settings * (can't be used same time as ethernet) @@ -73,7 +69,6 @@ #define CONFIG_CMD_NAND #endif

- /* * Network Settings */ @@ -96,7 +91,6 @@ #define CONFIG_SYS_MAX_FLASH_BANKS 1 #define CONFIG_SYS_MAX_FLASH_SECT 71

- /* * SPI Settings */ @@ -104,7 +98,6 @@ #define CONFIG_ENV_SPI_MAX_HZ 30000000 #define CONFIG_SF_DEFAULT_SPEED 30000000

- /* * Env Storage Settings */ @@ -122,14 +115,12 @@ #endif #define CONFIG_ENV_IS_EMBEDDED_IN_LDR

- /* * I2C Settings */ #define CONFIG_SYS_I2C #define CONFIG_SYS_I2C_ADI

- /* * USB Settings */ @@ -141,7 +132,6 @@ #define CONFIG_USB_MUSB_TIMEOUT 100000 #endif

- /* * Misc Settings */ @@ -167,7 +157,6 @@ /* #define STATUS_LED_BIT2 GPIO_PG12 */ #endif

- /* * Pull in common ADI header for remaining command/environment setup */ diff --git a/include/configs/bf527-ad7160-eval.h b/include/configs/bf527-ad7160-eval.h index dd62e7e..258115a 100644 --- a/include/configs/bf527-ad7160-eval.h +++ b/include/configs/bf527-ad7160-eval.h @@ -7,14 +7,12 @@

#include <asm/config-pre.h>

- /* * Processor Settings */ #define CONFIG_BFIN_CPU bf527-0.2 #define CONFIG_BFIN_BOOT_MODE BFIN_BOOT_SPI_MASTER

- /* * Clock Settings * CCLK = (CLKIN * VCO_MULT) / CCLK_DIV @@ -38,7 +36,6 @@ /* Values can range from 1-15 */ #define CONFIG_SCLK_DIV 5

- /* * Memory Settings */ @@ -55,7 +52,6 @@ #define CONFIG_SYS_MONITOR_LEN (768 * 1024) #define CONFIG_SYS_MALLOC_LEN (640 * 1024)

- /* * NAND Settings * (can't be used same time as ethernet) @@ -71,7 +67,6 @@ #define CONFIG_SYS_MAX_NAND_DEVICE 1 #endif

- /* * Flash Settings */ @@ -82,7 +77,6 @@ #define CONFIG_SYS_MAX_FLASH_BANKS 1 #define CONFIG_SYS_MAX_FLASH_SECT 259

- /* * SPI Settings */ @@ -90,7 +84,6 @@ #define CONFIG_ENV_SPI_MAX_HZ 30000000 #define CONFIG_SF_DEFAULT_SPEED 30000000

- /* * Env Storage Settings */ @@ -113,14 +106,12 @@ #define CONFIG_ENV_IS_EMBEDDED_IN_LDR #endif

- /* * I2C Settings */ #define CONFIG_SYS_I2C #define CONFIG_SYS_I2C_ADI

- /* * SPI_MMC Settings */ @@ -128,7 +119,6 @@ #define CONFIG_GENERIC_MMC #define CONFIG_MMC_SPI

- /* * Misc Settings */ diff --git a/include/configs/bf527-ezkit.h b/include/configs/bf527-ezkit.h index 44de44f..e268473 100644 --- a/include/configs/bf527-ezkit.h +++ b/include/configs/bf527-ezkit.h @@ -7,14 +7,12 @@

#include <asm/config-pre.h>

- /* * Processor Settings */ #define CONFIG_BFIN_CPU bf527-0.0 #define CONFIG_BFIN_BOOT_MODE BFIN_BOOT_PARA

- /* * Clock Settings * CCLK = (CLKIN * VCO_MULT) / CCLK_DIV @@ -38,7 +36,6 @@ /* Values can range from 1-15 */ #define CONFIG_SCLK_DIV 4

- /* * Memory Settings */ @@ -55,7 +52,6 @@ #define CONFIG_SYS_MONITOR_LEN (768 * 1024) #define CONFIG_SYS_MALLOC_LEN (640 * 1024)

- /* * NAND Settings * (can't be used same time as ethernet) @@ -71,7 +67,6 @@ #define CONFIG_SYS_MAX_NAND_DEVICE 1 #endif

- /* * Network Settings */ @@ -94,7 +89,6 @@ #define CONFIG_SYS_MAX_FLASH_BANKS 1 #define CONFIG_SYS_MAX_FLASH_SECT 259

- /* * SPI Settings */ @@ -102,7 +96,6 @@ #define CONFIG_ENV_SPI_MAX_HZ 30000000 #define CONFIG_SF_DEFAULT_SPEED 30000000

- /* * Env Storage Settings */ @@ -125,14 +118,12 @@ #define CONFIG_ENV_IS_EMBEDDED_IN_LDR #endif

- /* * I2C Settings */ #define CONFIG_SYS_I2C #define CONFIG_SYS_I2C_ADI

- /* * USB Settings */ diff --git a/include/configs/bf527-sdp.h b/include/configs/bf527-sdp.h index 6b51201..6b7d19e 100644 --- a/include/configs/bf527-sdp.h +++ b/include/configs/bf527-sdp.h @@ -7,14 +7,12 @@

#include <asm/config-pre.h>

- /* * Processor Settings */ #define CONFIG_BFIN_CPU bf527-0.2 #define CONFIG_BFIN_BOOT_MODE BFIN_BOOT_PARA

- /* * Clock Settings * CCLK = (CLKIN * VCO_MULT) / CCLK_DIV @@ -42,7 +40,6 @@ #define CONFIG_PLL_CTL_VAL 0x2a00 #define CONFIG_VR_CTL_VAL 0x7090

- /* * Memory Settings */ @@ -59,7 +56,6 @@ #define CONFIG_SYS_MONITOR_LEN (768 * 1024) #define CONFIG_SYS_MALLOC_LEN (640 * 1024)

- /* * Flash Settings */ @@ -70,7 +66,6 @@ #define CONFIG_SYS_MAX_FLASH_BANKS 1 #define CONFIG_SYS_MAX_FLASH_SECT 259

- /* * SPI Settings */ @@ -79,7 +74,6 @@ #define CONFIG_SF_DEFAULT_SPEED 30000000 #define CONFIG_SPI_FLASH_ALL

- /* * Env Storage Settings */ @@ -98,14 +92,12 @@ #define CONFIG_ENV_IS_EMBEDDED_IN_LDR #endif

- /* * I2C Settings */ #define CONFIG_SYS_I2C #define CONFIG_SYS_I2C_ADI

- /* * Misc Settings */ diff --git a/include/configs/bf533-ezkit.h b/include/configs/bf533-ezkit.h index 9581101..e154812 100644 --- a/include/configs/bf533-ezkit.h +++ b/include/configs/bf533-ezkit.h @@ -7,14 +7,12 @@

#include <asm/config-pre.h>

- /* * Processor Settings */ #define CONFIG_BFIN_CPU bf533-0.3 #define CONFIG_BFIN_BOOT_MODE BFIN_BOOT_BYPASS

- /* * Clock Settings * CCLK = (CLKIN * VCO_MULT) / CCLK_DIV @@ -38,7 +36,6 @@ /* Values can range from 1-15 */ #define CONFIG_SCLK_DIV 5

- /* * Memory Settings */ @@ -60,7 +57,6 @@ #define CONFIG_SYS_MONITOR_LEN (256 * 1024) #define CONFIG_SYS_MALLOC_LEN (128 * 1024)

- /* * Network Settings */ @@ -76,7 +72,6 @@ } while (0) #define CONFIG_HOSTNAME bf533-ezkit

- /* * Flash Settings */ @@ -88,7 +83,6 @@ #define CONFIG_ENV_SECT_SIZE 0x10000 #define FLASH_TOT_SECT 40

- /* * I2C Settings */ diff --git a/include/configs/bf533-stamp.h b/include/configs/bf533-stamp.h index c8c48ae..c2466ca 100644 --- a/include/configs/bf533-stamp.h +++ b/include/configs/bf533-stamp.h @@ -7,7 +7,6 @@

#include <asm/config-pre.h>

- /* * Processor Settings */ @@ -53,7 +52,6 @@ #define CONFIG_SYS_MONITOR_LEN (256 * 1024) #define CONFIG_SYS_MALLOC_LEN (384 * 1024)

- /* * Network Settings */ @@ -69,7 +67,6 @@ } while (0) #define CONFIG_HOSTNAME bf533-stamp

- /* I2C */ #define CONFIG_SYS_I2C #define CONFIG_SYS_I2C_SOFT /* I2C bit-banged */ @@ -134,7 +131,6 @@ common/env_embedded.o (.text*); #endif

- /* * I2C Settings */ @@ -177,7 +173,6 @@ #define CONFIG_EBIU_AMBCTL1_VAL 0x99B3ffc2 #endif

- /* * Misc Settings */ @@ -211,7 +206,6 @@ /* define to enable splash screen support */ /* #define CONFIG_VIDEO */

- /* * Pull in common ADI header for remaining command/environment setup */ diff --git a/include/configs/bf537-minotaur.h b/include/configs/bf537-minotaur.h index 425f0a9..a351d1b 100644 --- a/include/configs/bf537-minotaur.h +++ b/include/configs/bf537-minotaur.h @@ -20,14 +20,12 @@

#include <asm/config-pre.h>

- /* * Processor Settings */ #define CONFIG_BFIN_CPU bf537-0.2 #define CONFIG_BFIN_BOOT_MODE BFIN_BOOT_SPI_MASTER

- /* * Clock Settings * CCLK = (CLKIN * VCO_MULT) / CCLK_DIV @@ -51,7 +49,6 @@ /* Values can range from 1-15 */ #define CONFIG_SCLK_DIV 5

- /* * Memory Settings */ @@ -68,7 +65,6 @@ #define CONFIG_SYS_MONITOR_LEN (256 << 10) #define CONFIG_SYS_MALLOC_LEN (128 << 10)

- /* * Network Settings */ @@ -87,14 +83,12 @@ #define CONFIG_SYS_AUTOLOAD "no" #define CONFIG_ROOTPATH "/romfs"

- /* * Flash Settings */ /* We don't have a parallel flash chip there */ #define CONFIG_SYS_NO_FLASH

- /* * SPI Settings */ @@ -102,7 +96,6 @@ #define CONFIG_ENV_SPI_MAX_HZ 30000000 #define CONFIG_SF_DEFAULT_SPEED 30000000

- /* * Env Storage Settings */ @@ -112,7 +105,6 @@ #define CONFIG_ENV_SECT_SIZE 0x10000 #define CONFIG_ENV_IS_EMBEDDED_IN_LDR

- /* * I2C settings */ @@ -121,7 +113,6 @@ #define CONFIG_SYS_I2C_SPEED 50000 #define CONFIG_SYS_I2C_SLAVE 0

- /* * Misc Settings */ diff --git a/include/configs/bf537-pnav.h b/include/configs/bf537-pnav.h index 5794f47..bced1df 100644 --- a/include/configs/bf537-pnav.h +++ b/include/configs/bf537-pnav.h @@ -7,14 +7,12 @@

#include <asm/config-pre.h>

- /* * Processor Settings */ #define CONFIG_BFIN_CPU bf537-0.2 #define CONFIG_BFIN_BOOT_MODE BFIN_BOOT_SPI_MASTER

- /* * Clock Settings * CCLK = (CLKIN * VCO_MULT) / CCLK_DIV @@ -38,7 +36,6 @@ /* Values can range from 1-15 */ #define CONFIG_SCLK_DIV 4

- /* * Memory Settings */ @@ -55,7 +52,6 @@ #define CONFIG_SYS_MONITOR_LEN (512 * 1024) #define CONFIG_SYS_MALLOC_LEN (128 * 1024)

- /* * Network Settings */ @@ -75,7 +71,6 @@ #define CONFIG_SYS_MAX_FLASH_BANKS 1 #define CONFIG_SYS_MAX_FLASH_SECT 71

- /* * SPI Settings */ @@ -83,7 +78,6 @@ #define CONFIG_ENV_SPI_MAX_HZ 30000000 #define CONFIG_SF_DEFAULT_SPEED 30000000

- /* * Env Storage Settings */ @@ -112,7 +106,6 @@ common/env_embedded.o (.text*); #endif

- /* * NAND Settings */ @@ -133,14 +126,12 @@ #define NAND_PLAT_WRITE_ADR(chip, cmd) BFIN_NAND_WRITE(BFIN_NAND_ALE(chip), cmd) #define NAND_PLAT_GPIO_DEV_READY GPIO_PF12

- /* * I2C settings */ #define CONFIG_SYS_I2C #define CONFIG_SYS_I2C_ADI

- /* * Misc Settings */ @@ -157,7 +148,6 @@ #define CONFIG_BOOTCOMMAND "run nandboot" #define CONFIG_BOOTARGS_ROOT "/dev/mtdblock1 rw rootfstype=yaffs"

- /* * Pull in common ADI header for remaining command/environment setup */ diff --git a/include/configs/bf537-srv1.h b/include/configs/bf537-srv1.h index fc4f50b..cbe752a 100644 --- a/include/configs/bf537-srv1.h +++ b/include/configs/bf537-srv1.h @@ -20,14 +20,12 @@

#include <asm/config-pre.h>

- /* * Processor Settings */ #define CONFIG_BFIN_CPU bf537-0.2 #define CONFIG_BFIN_BOOT_MODE BFIN_BOOT_SPI_MASTER

- /* * Clock Settings * CCLK = (CLKIN * VCO_MULT) / CCLK_DIV @@ -51,7 +49,6 @@ /* Values can range from 1-15 */ #define CONFIG_SCLK_DIV 5

- /* * Memory Settings */ @@ -68,7 +65,6 @@ #define CONFIG_SYS_MONITOR_LEN (256 << 10) #define CONFIG_SYS_MALLOC_LEN (384 << 10)

- /* * Network Settings */ @@ -93,7 +89,6 @@ /* We don't have a parallel flash chip there */ #define CONFIG_SYS_NO_FLASH

- /* * SPI Settings */ @@ -101,7 +96,6 @@ #define CONFIG_ENV_SPI_MAX_HZ 30000000 #define CONFIG_SF_DEFAULT_SPEED 30000000

- /* * Env Storage Settings */ @@ -111,7 +105,6 @@ #define CONFIG_ENV_SECT_SIZE 0x10000 #define CONFIG_ENV_IS_EMBEDDED_IN_LDR

- /* * I2C settings */ @@ -120,7 +113,6 @@ #define CONFIG_SYS_I2C_SPEED 50000 #define CONFIG_SYS_I2C_SLAVE 0

- /* * Misc Settings */ diff --git a/include/configs/bf537-stamp.h b/include/configs/bf537-stamp.h index b178713..4f861aa 100644 --- a/include/configs/bf537-stamp.h +++ b/include/configs/bf537-stamp.h @@ -7,14 +7,12 @@

#include <asm/config-pre.h>

- /* * Processor Settings */ #define CONFIG_BFIN_CPU bf537-0.2 #define CONFIG_BFIN_BOOT_MODE BFIN_BOOT_BYPASS

- /* * Clock Settings * CCLK = (CLKIN * VCO_MULT) / CCLK_DIV @@ -38,7 +36,6 @@ /* Values can range from 1-15 */ #define CONFIG_SCLK_DIV 4

- /* * Memory Settings */ @@ -55,7 +52,6 @@ #define CONFIG_SYS_MONITOR_LEN (768 * 1024) #define CONFIG_SYS_MALLOC_LEN (384 * 1024)

- /* * Network Settings */ @@ -77,7 +73,6 @@ /* some have 67 sectors (M29W320DB), but newer have 71 (M29W320EB) */ #define CONFIG_SYS_MAX_FLASH_SECT 71

- /* * SPI Settings */ @@ -86,7 +81,6 @@ #define CONFIG_SF_DEFAULT_SPEED 30000000 #define CONFIG_SPI_FLASH_ALL

- /* * Env Storage Settings */ @@ -120,14 +114,12 @@ common/env_embedded.o (.text*); #endif

- /* * I2C Settings */ #define CONFIG_SYS_I2C #define CONFIG_SYS_I2C_ADI

- /* * SPI_MMC Settings */ @@ -243,7 +235,6 @@

#endif

- /* * Misc Settings */ @@ -270,7 +261,6 @@ #define CONFIG_BOOTCOMMAND "bootldr 0x203f0100" #endif

- /* * Pull in common ADI header for remaining command/environment setup */ diff --git a/include/configs/bf538f-ezkit.h b/include/configs/bf538f-ezkit.h index 55becdc..a6d039c 100644 --- a/include/configs/bf538f-ezkit.h +++ b/include/configs/bf538f-ezkit.h @@ -7,14 +7,12 @@

#include <asm/config-pre.h>

- /* * Processor Settings */ #define CONFIG_BFIN_CPU bf538-0.4 #define CONFIG_BFIN_BOOT_MODE BFIN_BOOT_BYPASS

- /* * Clock Settings * CCLK = (CLKIN * VCO_MULT) / CCLK_DIV @@ -38,7 +36,6 @@ /* Values can range from 1-15 */ #define CONFIG_SCLK_DIV 4

- /* * Memory Settings */ @@ -55,7 +52,6 @@ #define CONFIG_SYS_MONITOR_LEN (256 * 1024) #define CONFIG_SYS_MALLOC_LEN (384 * 1024)

- /* * Network Settings */ @@ -64,7 +60,6 @@ #define CONFIG_SMC91111_BASE 0x20310300 #define CONFIG_HOSTNAME bf538f-ezkit

- /* * Flash Settings */ @@ -75,7 +70,6 @@ #define CONFIG_SYS_MAX_FLASH_BANKS 1 #define CONFIG_SYS_MAX_FLASH_SECT 71

- /* * SPI Settings */ @@ -119,14 +113,12 @@ common/env_embedded.o (.text*); #endif

- /* * I2C Settings */ #define CONFIG_SYS_I2C #define CONFIG_SYS_I2C_ADI

- /* * Misc Settings */ diff --git a/include/configs/bf548-ezkit.h b/include/configs/bf548-ezkit.h index 8198cb8..6830e4d 100644 --- a/include/configs/bf548-ezkit.h +++ b/include/configs/bf548-ezkit.h @@ -7,14 +7,12 @@

#include <asm/config-pre.h>

- /* * Processor Settings */ #define CONFIG_BFIN_CPU bf548-0.0 #define CONFIG_BFIN_BOOT_MODE BFIN_BOOT_PARA

- /* * Clock Settings * CCLK = (CLKIN * VCO_MULT) / CCLK_DIV @@ -38,7 +36,6 @@ /* Values can range from 1-15 */ #define CONFIG_SCLK_DIV 4

- /* * Memory Settings */ @@ -64,7 +61,6 @@ #define CONFIG_SYS_MONITOR_LEN (1024 * 1024) #define CONFIG_SYS_MALLOC_LEN (768 * 1024)

- /* * Network Settings */ @@ -74,7 +70,6 @@ #define CONFIG_SMC911X_16_BIT #define CONFIG_HOSTNAME bf548-ezkit

- /* * Flash Settings */ @@ -85,7 +80,6 @@ #define CONFIG_SYS_MAX_FLASH_BANKS 1 #define CONFIG_SYS_MAX_FLASH_SECT 259

- /* * SPI Settings */ @@ -93,7 +87,6 @@ #define CONFIG_ENV_SPI_MAX_HZ 30000000 #define CONFIG_SF_DEFAULT_SPEED 30000000

- /* * Env Storage Settings */ @@ -133,7 +126,6 @@ #define CONFIG_SYS_I2C #define CONFIG_SYS_I2C_ADI

- /* * SATA */ @@ -146,7 +138,6 @@ #define CONFIG_BFIN_ATA_MODE XFER_PIO_4 #endif

- /* * SDH Settings */ @@ -156,7 +147,6 @@ #define CONFIG_BFIN_SDH #endif

- /* * USB Settings */ @@ -168,7 +158,6 @@ #define CONFIG_USB_MUSB_TIMEOUT 100000 #endif

- /* * Misc Settings */ @@ -199,7 +188,6 @@ #define CONFIG_SYS_POST_FLASH_END 127 #endif

- /* * Pull in common ADI header for remaining command/environment setup */ diff --git a/include/configs/bf561-acvilon.h b/include/configs/bf561-acvilon.h index 31862da..c36be03 100644 --- a/include/configs/bf561-acvilon.h +++ b/include/configs/bf561-acvilon.h @@ -8,14 +8,12 @@

#include <asm/config-pre.h>

- /* * Processor Settings */ #define CONFIG_BFIN_CPU bf561-0.5 #define CONFIG_BFIN_BOOT_MODE BFIN_BOOT_BYPASS

- /* * Clock Settings * CCLK = (CLKIN * VCO_MULT) / CCLK_DIV @@ -39,7 +37,6 @@ /* Values can range from 1-15 */ #define CONFIG_SCLK_DIV 5

- /* * Memory Settings */ @@ -56,7 +53,6 @@ #define CONFIG_SYS_MONITOR_LEN (384 * 1024) #define CONFIG_SYS_MALLOC_LEN (128 * 1024)

- /* * RTC Settings */ @@ -71,7 +67,6 @@ #define CONFIG_SYS_DTT_LOW_TEMP -30 #define CONFIG_SYS_DTT_HYSTERESIS 3*/

- /* * Network Settings */ @@ -91,13 +86,11 @@

#define CONFIG_HOSTNAME bf561-acvilon

- /* * Flash Settings */ #define CONFIG_SYS_NO_FLASH

- /* * I2C Settings */ @@ -107,7 +100,6 @@ #define CONFIG_PCA9564_I2C #define CONFIG_PCA9564_BASE 0x2c000000

- /* * SPI Settings */ @@ -115,7 +107,6 @@ #define CONFIG_ENV_SPI_MAX_HZ 10000000 #define CONFIG_SF_DEFAULT_SPEED 10000000

- /* * Env Storage Settings */ @@ -124,7 +115,6 @@ #define CONFIG_ENV_OFFSET ((16 + 256) * 1056) #define CONFIG_ENV_SIZE (8 * 1056)

- /* * NAND Settings * We're using NAND_PLAT driver to make things simplier @@ -146,7 +136,6 @@ #define NAND_PLAT_WRITE_ADR(chip, cmd) BFIN_NAND_WRITE(BFIN_NAND_ALE(chip), cmd) #define NAND_PLAT_GPIO_DEV_READY GPIO_PF10

- /* * Misc Settings */ diff --git a/include/configs/bf561-ezkit.h b/include/configs/bf561-ezkit.h index 1a3b33f..2fefe98 100644 --- a/include/configs/bf561-ezkit.h +++ b/include/configs/bf561-ezkit.h @@ -7,14 +7,12 @@

#include <asm/config-pre.h>

- /* * Processor Settings */ #define CONFIG_BFIN_CPU bf561-0.3 #define CONFIG_BFIN_BOOT_MODE BFIN_BOOT_BYPASS

- /* * Clock Settings * CCLK = (CLKIN * VCO_MULT) / CCLK_DIV @@ -38,7 +36,6 @@ /* Values can range from 1-15 */ #define CONFIG_SCLK_DIV 6

- /* * Memory Settings */ @@ -55,7 +52,6 @@ #define CONFIG_SYS_MONITOR_LEN (256 * 1024) #define CONFIG_SYS_MALLOC_LEN (128 * 1024)

- /* * Network Settings */ @@ -65,7 +61,6 @@ #define CONFIG_SMC_USE_32_BIT 1 #define CONFIG_HOSTNAME bf561-ezkit

- /* * Flash Settings */ @@ -82,7 +77,6 @@ #define CONFIG_ENV_SIZE CONFIG_ENV_SECT_SIZE #define CONFIG_ENV_SECT_SIZE 0x2000

- /* * I2C Settings */ @@ -106,7 +100,6 @@ */ /* #define CONFIG_CORE1_RUN 1 */

- /* * Pull in common ADI header for remaining command/environment setup */ diff --git a/include/configs/bf609-ezkit.h b/include/configs/bf609-ezkit.h index 3e0bff5..a62038e 100644 --- a/include/configs/bf609-ezkit.h +++ b/include/configs/bf609-ezkit.h @@ -13,7 +13,6 @@ #define CONFIG_BFIN_CPU bf609-0.0 #define CONFIG_BFIN_BOOT_MODE BFIN_BOOT_PARA

- /* For ez-board version 1.0, else undef this */ #define CONFIG_BFIN_BOARD_VERSION_1_0

diff --git a/include/configs/br4.h b/include/configs/br4.h index 85f31a4..402f352 100644 --- a/include/configs/br4.h +++ b/include/configs/br4.h @@ -10,14 +10,12 @@

#include <asm/config-pre.h>

- /* * Processor Settings */ #define CONFIG_BFIN_CPU bf537-0.3 #define CONFIG_BFIN_BOOT_MODE BFIN_BOOT_SPI_MASTER

- /* * Clock Settings * CCLK = (CLKIN * VCO_MULT) / CCLK_DIV @@ -41,7 +39,6 @@ /* Values can range from 1-15 */ #define CONFIG_SCLK_DIV 5

- /* * Memory Settings */ @@ -58,7 +55,6 @@ #define CONFIG_SYS_MONITOR_LEN (512 * 1024) #define CONFIG_SYS_MALLOC_LEN (384 * 1024)

- /* * Network Settings */ @@ -75,7 +71,6 @@ */ #define CONFIG_SYS_NO_FLASH /* We have no parallel FLASH */

- /* * SPI Settings */ @@ -83,7 +78,6 @@ #define CONFIG_ENV_SPI_MAX_HZ 30000000 #define CONFIG_SF_DEFAULT_SPEED 30000000

- /* * Env Storage Settings */ @@ -93,14 +87,12 @@ #define CONFIG_ENV_SECT_SIZE 0x10000 #define CONFIG_ENV_IS_EMBEDDED_IN_LDR

- /* * I2C Settings */ #define CONFIG_SYS_I2C #define CONFIG_SYS_I2C_ADI

- /* * NAND Settings */ diff --git a/include/configs/canmb.h b/include/configs/canmb.h index 0a39cdf..028d0a2 100644 --- a/include/configs/canmb.h +++ b/include/configs/canmb.h @@ -135,7 +135,6 @@ #define CONFIG_SYS_INIT_RAM_ADDR MPC5XXX_SRAM #define CONFIG_SYS_INIT_RAM_SIZE MPC5XXX_SRAM_SIZE /* Size of used area in DPRAM */

- #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

diff --git a/include/configs/charon.h b/include/configs/charon.h index 2f537e0..578c108 100644 --- a/include/configs/charon.h +++ b/include/configs/charon.h @@ -34,7 +34,6 @@ "mtdparts=" MTDPARTS_DEFAULT "\0" \ "addmtd=setenv bootargs ${bootargs} ${mtdparts}\0"

- /* additional features on charon board */ #define CONFIG_RESET_PHY_R

diff --git a/include/configs/cm-bf527.h b/include/configs/cm-bf527.h index 761e2c5..0b31dc9 100644 --- a/include/configs/cm-bf527.h +++ b/include/configs/cm-bf527.h @@ -7,14 +7,12 @@

#include <asm/config-pre.h>

- /* * Processor Settings */ #define CONFIG_BFIN_CPU bf527-0.0 #define CONFIG_BFIN_BOOT_MODE BFIN_BOOT_PARA

- /* * Clock Settings * CCLK = (CLKIN * VCO_MULT) / CCLK_DIV @@ -41,7 +39,6 @@ /* Decrease core voltage */ #define CONFIG_VR_CTL_VAL (VLEV_120 | CLKBUFOE | FREQ_1000)

- /* * Memory Settings */ @@ -58,7 +55,6 @@ #define CONFIG_SYS_MONITOR_LEN (256 * 1024) #define CONFIG_SYS_MALLOC_LEN (128 * 1024)

- /* * NAND Settings * (can't be used sametime as ethernet) @@ -71,7 +67,6 @@ #define CONFIG_CMD_NAND #endif

- /* * Network Settings */ @@ -95,7 +90,6 @@ #define CONFIG_SYS_MAX_FLASH_BANKS 1 #define CONFIG_SYS_MAX_FLASH_SECT 67

- /* * Env Storage Settings */ @@ -106,14 +100,12 @@ #define CONFIG_ENV_SECT_SIZE 0x8000 #define CONFIG_ENV_IS_EMBEDDED_IN_LDR

- /* * I2C Settings */ #define CONFIG_SYS_I2C #define CONFIG_SYS_I2C_ADI

- /* * Misc Settings */ diff --git a/include/configs/cm-bf533.h b/include/configs/cm-bf533.h index d06333d..7039cba 100644 --- a/include/configs/cm-bf533.h +++ b/include/configs/cm-bf533.h @@ -7,14 +7,12 @@

#include <asm/config-pre.h>

- /* * Processor Settings */ #define CONFIG_BFIN_CPU bf533-0.3 #define CONFIG_BFIN_BOOT_MODE BFIN_BOOT_BYPASS

- /* * Clock Settings * CCLK = (CLKIN * VCO_MULT) / CCLK_DIV @@ -41,7 +39,6 @@ /* Decrease core voltage */ #define CONFIG_VR_CTL_VAL (VLEV_115 | GAIN_20 | FREQ_1000)

- /* * Memory Settings */ @@ -58,7 +55,6 @@ #define CONFIG_SYS_MONITOR_LEN (256 * 1024) #define CONFIG_SYS_MALLOC_LEN (128 * 1024)

- /* * Network Settings */ @@ -67,7 +63,6 @@ #define CONFIG_SMC91111_BASE 0x20200300 #define CONFIG_HOSTNAME cm-bf533

- /* * Flash Settings */ @@ -78,7 +73,6 @@ #define CONFIG_SYS_MAX_FLASH_BANKS 1 #define CONFIG_SYS_MAX_FLASH_SECT 16

- /* * Env Storage Settings */ @@ -87,7 +81,6 @@ #define CONFIG_ENV_SECT_SIZE 0x20000 #define CONFIG_ENV_SIZE 0x10000

- /* * Misc Settings */ diff --git a/include/configs/cm-bf537e.h b/include/configs/cm-bf537e.h index 746a5bd..78841cd 100644 --- a/include/configs/cm-bf537e.h +++ b/include/configs/cm-bf537e.h @@ -7,14 +7,12 @@

#include <asm/config-pre.h>

- /* * Processor Settings */ #define CONFIG_BFIN_CPU bf537-0.2 #define CONFIG_BFIN_BOOT_MODE BFIN_BOOT_BYPASS

- /* * Clock Settings * CCLK = (CLKIN * VCO_MULT) / CCLK_DIV @@ -41,7 +39,6 @@ /* Decrease core voltage */ #define CONFIG_VR_CTL_VAL (VLEV_115 | CLKBUFOE | GAIN_20 | FREQ_1000)

- /* * Memory Settings */ @@ -58,7 +55,6 @@ #define CONFIG_SYS_MONITOR_LEN (768 * 1024) #define CONFIG_SYS_MALLOC_LEN (128 * 1024)

- /* * Network Settings */ @@ -83,14 +79,12 @@ #define CONFIG_SYS_MAX_FLASH_BANKS 1 #define CONFIG_SYS_MAX_FLASH_SECT 35

- /* * SPI Settings */ #define CONFIG_BFIN_SPI #define CONFIG_ENV_SPI_MAX_HZ 30000000

- /* * Env Storage Settings */ @@ -115,14 +109,12 @@ common/env_embedded.o (.text*); #endif

- /* * I2C Settings */ #define CONFIG_SYS_I2C #define CONFIG_SYS_I2C_ADI

- /* * SPI_MMC Settings */ @@ -130,7 +122,6 @@ #define CONFIG_GENERIC_MMC #define CONFIG_MMC_SPI

- /* * Misc Settings */ diff --git a/include/configs/cm-bf537u.h b/include/configs/cm-bf537u.h index 71008aa..5785ebd 100644 --- a/include/configs/cm-bf537u.h +++ b/include/configs/cm-bf537u.h @@ -7,14 +7,12 @@

#include <asm/config-pre.h>

- /* * Processor Settings */ #define CONFIG_BFIN_CPU bf537-0.2 #define CONFIG_BFIN_BOOT_MODE BFIN_BOOT_BYPASS

- /* * Clock Settings * CCLK = (CLKIN * VCO_MULT) / CCLK_DIV @@ -40,7 +38,6 @@ /* Core voltage */ #define CONFIG_VR_CTL_VAL (VLEV_110 | GAIN_20 | FREQ_1000)

- /* * Memory Settings */ @@ -57,7 +54,6 @@ #define CONFIG_SYS_MONITOR_LEN (768 * 1024) #define CONFIG_SYS_MALLOC_LEN (128 * 1024)

- /* * Network Settings */ @@ -81,14 +77,12 @@ #define CONFIG_SYS_MAX_FLASH_BANKS 1 #define CONFIG_SYS_MAX_FLASH_SECT 35

- /* * SPI Settings */ #define CONFIG_BFIN_SPI #define CONFIG_ENV_SPI_MAX_HZ 30000000

- /* * Env Storage Settings */ @@ -113,14 +107,12 @@ common/env_embedded.o (.text*); #endif

- /* * I2C Settings */ #define CONFIG_SYS_I2C #define CONFIG_SYS_I2C_ADI

- /* * SPI_MMC Settings */ diff --git a/include/configs/cm-bf548.h b/include/configs/cm-bf548.h index 37205a9..d1aa262 100644 --- a/include/configs/cm-bf548.h +++ b/include/configs/cm-bf548.h @@ -7,14 +7,12 @@

#include <asm/config-pre.h>

- /* * Processor Settings */ #define CONFIG_BFIN_CPU bf548-0.0 #define CONFIG_BFIN_BOOT_MODE BFIN_BOOT_PARA

- /* * Clock Settings * CCLK = (CLKIN * VCO_MULT) / CCLK_DIV @@ -41,7 +39,6 @@ /* Decrease core voltage */ #define CONFIG_VR_CTL_VAL (VLEV_115 | GAIN_20 | FREQ_1000)

- /* * Memory Settings */ @@ -67,7 +64,6 @@ #define CONFIG_SYS_MONITOR_LEN (512 * 1024) #define CONFIG_SYS_MALLOC_LEN (640 * 1024)

- /* * Network Settings */ @@ -77,7 +73,6 @@ #define CONFIG_SMC911X_16_BIT #define CONFIG_HOSTNAME cm-bf548

- /* * Flash Settings */ @@ -88,7 +83,6 @@ #define CONFIG_SYS_MAX_FLASH_BANKS 1 #define CONFIG_SYS_MAX_FLASH_SECT 259

- /* * Env Storage Settings */ @@ -98,14 +92,12 @@ #define CONFIG_ENV_SIZE 0x8000 #define CONFIG_ENV_IS_EMBEDDED_IN_LDR

- /* * I2C Settings */ #define CONFIG_SYS_I2C #define CONFIG_SYS_I2C_ADI

- /* * Misc Settings */ @@ -134,7 +126,6 @@ #define FLASH_END_POST_BLOCK 71 /* Should < = 71 */ #endif

- /* * Pull in common ADI header for remaining command/environment setup */ diff --git a/include/configs/cm-bf561.h b/include/configs/cm-bf561.h index 284ec83..3860e0e 100644 --- a/include/configs/cm-bf561.h +++ b/include/configs/cm-bf561.h @@ -7,14 +7,12 @@

#include <asm/config-pre.h>

- /* * Processor Settings */ #define CONFIG_BFIN_CPU bf561-0.3 #define CONFIG_BFIN_BOOT_MODE BFIN_BOOT_PARA

- /* * Clock Settings * CCLK = (CLKIN * VCO_MULT) / CCLK_DIV @@ -41,7 +39,6 @@ /* Decrease core voltage */ #define CONFIG_VR_CTL_VAL (VLEV_110 | GAIN_20 | FREQ_1000)

- /* * Memory Settings */ @@ -58,7 +55,6 @@ #define CONFIG_SYS_MONITOR_LEN (256 * 1024) #define CONFIG_SYS_MALLOC_LEN (128 * 1024)

- /* * Network Settings */ @@ -68,7 +64,6 @@ #define CONFIG_SMC911X_16_BIT #define CONFIG_HOSTNAME cm-bf561

- /* * Flash Settings */ @@ -79,7 +74,6 @@ #define CONFIG_SYS_MAX_FLASH_BANKS 1 #define CONFIG_SYS_MAX_FLASH_SECT 67

- /* * Env Storage Settings */ @@ -89,7 +83,6 @@ #define CONFIG_ENV_SIZE 0x10000 #define CONFIG_ENV_IS_EMBEDDED_IN_LDR

- /* * Misc Settings */ diff --git a/include/configs/cm5200.h b/include/configs/cm5200.h index 766faa6..cdb8931 100644 --- a/include/configs/cm5200.h +++ b/include/configs/cm5200.h @@ -8,10 +8,8 @@ #ifndef __CONFIG_H #define __CONFIG_H

- #define CONFIG_DISPLAY_BOARDINFO

- /* * High Level Configuration Options */ @@ -167,13 +165,11 @@ #define CONFIG_SYS_MAX_FLASH_SECT 256 /* max num of sectors on one chip */ #define CONFIG_SYS_FLASH_SIZE 0x02000000 /* 32 MiB */

- #if (CONFIG_SYS_MONITOR_BASE < CONFIG_SYS_FLASH_BASE) #define CONFIG_SYS_RAMBOOT 1 #undef CONFIG_SYS_LOWBOOT #endif

- /* * Chip selects configuration */ diff --git a/include/configs/cm_t335.h b/include/configs/cm_t335.h index 99b5d3e..c4f1d4f 100644 --- a/include/configs/cm_t335.h +++ b/include/configs/cm_t335.h @@ -63,7 +63,6 @@ "nboot ${loadaddr} nand0 900000; " \ "bootm ${loadaddr}\0"

- #define CONFIG_EXTRA_ENV_SETTINGS \ "loadaddr=82000000\0" \ "console=ttyO0,115200n8\0" \ diff --git a/include/configs/cm_t35.h b/include/configs/cm_t35.h index debedec..aca9288 100644 --- a/include/configs/cm_t35.h +++ b/include/configs/cm_t35.h @@ -120,7 +120,6 @@ #define CONFIG_CMD_MMC /* MMC support */ #define CONFIG_CMD_NAND /* NAND support */

- #define CONFIG_SYS_NO_FLASH #define CONFIG_SYS_I2C #define CONFIG_SYS_OMAP24_I2C_SPEED 100000 diff --git a/include/configs/cm_t3517.h b/include/configs/cm_t3517.h index 8ac41e2..1bedea7 100644 --- a/include/configs/cm_t3517.h +++ b/include/configs/cm_t3517.h @@ -133,7 +133,6 @@ #define CONFIG_CMD_MMC /* MMC support */ #define CONFIG_CMD_NAND /* NAND support */

- #define CONFIG_SYS_NO_FLASH #define CONFIG_SYS_I2C #define CONFIG_SYS_OMAP24_I2C_SPEED 400000 diff --git a/include/configs/cm_t43.h b/include/configs/cm_t43.h index 0e05194..ee818ed 100644 --- a/include/configs/cm_t43.h +++ b/include/configs/cm_t43.h @@ -154,7 +154,6 @@ "run emmcboot; " \ "fi;"

- #define CONFIG_CONS_INDEX 1

/* SPL defines. */ diff --git a/include/configs/cobra5272.h b/include/configs/cobra5272.h index 9e44015..b291ba4 100644 --- a/include/configs/cobra5272.h +++ b/include/configs/cobra5272.h @@ -116,7 +116,6 @@ #define CONFIG_BOOTP_GATEWAY #define CONFIG_BOOTP_HOSTNAME

- /* * Command line configuration. */ @@ -157,7 +156,6 @@ seconds u-boot will wait before starting defined (auto-)boot command, setting to -1 disables delay, setting to 0 will too prevent access to u-boot command interface: u-boot then has to reflashed */

- /* The following settings will be contained in the environment block ; if you want to use a neutral environment all those settings can be manually set in u-boot: 'set' command */ diff --git a/include/configs/controlcenterd.h b/include/configs/controlcenterd.h index 77b3e50..9d1c6ae 100644 --- a/include/configs/controlcenterd.h +++ b/include/configs/controlcenterd.h @@ -45,7 +45,6 @@ #define CONFIG_CONTROLCENTERD #define CONFIG_MP /* support multiple processors */

- #define CONFIG_SYS_NO_FLASH #define CONFIG_ENABLE_36BIT_PHYS #define CONFIG_FSL_LAW /* Use common FSL init code */ @@ -98,7 +97,6 @@ #define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE #define CONFIG_SYS_MALLOC_LEN (10 * 1024 * 1024)

- /* * Memory map * @@ -215,7 +213,6 @@ */ #define CONFIG_HARD_SPI

- #define CONFIG_SF_DEFAULT_SPEED 10000000 #define CONFIG_SF_DEFAULT_MODE 0 #endif @@ -232,7 +229,6 @@ #define CONFIG_FSL_ESDHC #define CONFIG_SYS_FSL_ESDHC_ADDR CONFIG_SYS_MPC85xx_ESDHC_ADDR

- #ifndef CONFIG_TRAILBLAZER

/* diff --git a/include/configs/crownbay.h b/include/configs/crownbay.h index fc1a8ba..432f2f6 100644 --- a/include/configs/crownbay.h +++ b/include/configs/crownbay.h @@ -28,7 +28,6 @@ #define CONFIG_SCSI_DEV_LIST \ {PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_TCF_SATA}

- #define CONFIG_MMC #define CONFIG_SDHCI #define CONFIG_GENERIC_MMC diff --git a/include/configs/cyrus.h b/include/configs/cyrus.h index 701f59e..d1927b5 100644 --- a/include/configs/cyrus.h +++ b/include/configs/cyrus.h @@ -17,7 +17,6 @@ #error Must call Cyrus CONFIG with a specific CPU enabled. #endif

- #define CONFIG_MMC #define CONFIG_SDCARD #define CONFIG_FSL_SATA_V2 @@ -43,7 +42,6 @@ #define CONFIG_SYS_FSL_PBL_RCW board/varisys/cyrus/rcw_p5040.cfg #endif

- /* High Level Configuration Options */ #define CONFIG_BOOKE #define CONFIG_E500 /* BOOKE e500 family */ @@ -51,7 +49,6 @@ #define CONFIG_SYS_BOOK3E_HV /* Category E.HV supported */ #define CONFIG_MP /* support multiple processors */

- #define CONFIG_SYS_MMC_MAX_DEVICE 1

#ifndef CONFIG_SYS_TEXT_BASE @@ -173,7 +170,6 @@ #define CONFIG_SYS_OR0_PRELIM 0xfff00010 #define CONFIG_SYS_OR1_PRELIM 0xfff00010

- #define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE /* start of monitor */

#if defined(CONFIG_RAMBOOT_PBL) diff --git a/include/configs/da850evm.h b/include/configs/da850evm.h index 2972057..9466332 100644 --- a/include/configs/da850evm.h +++ b/include/configs/da850evm.h @@ -20,7 +20,6 @@ #define CONFIG_USE_SPIFLASH #endif

- /* * SoC Configuration */ diff --git a/include/configs/dbau1x00.h b/include/configs/dbau1x00.h index faf2a87..f9f30b1 100644 --- a/include/configs/dbau1x00.h +++ b/include/configs/dbau1x00.h @@ -61,7 +61,6 @@ #define CONFIG_BOOTCOMMAND "bootp;bootm" #endif /* CONFIG_DBAU1550 */

- /* * BOOTP options */ @@ -70,7 +69,6 @@ #define CONFIG_BOOTP_GATEWAY #define CONFIG_BOOTP_HOSTNAME

- /* * Command line configuration. */ @@ -89,7 +87,6 @@

#endif

- /* * Miscellaneous configurable options */ @@ -172,7 +169,6 @@

#define CONFIG_NR_DRAM_BANKS 2

- #ifdef CONFIG_DBAU1550 #define MEM_SIZE 192 #else diff --git a/include/configs/devkit8000.h b/include/configs/devkit8000.h index 4afc91b..6acd2fe 100644 --- a/include/configs/devkit8000.h +++ b/include/configs/devkit8000.h @@ -185,7 +185,6 @@ "fi; " \ "else run nandboot; fi\0"

- #define CONFIG_BOOTCOMMAND "run autoboot"

/* Boot Argument Buffer Size */ diff --git a/include/configs/dockstar.h b/include/configs/dockstar.h index ae3017c..e54321b 100644 --- a/include/configs/dockstar.h +++ b/include/configs/dockstar.h @@ -12,7 +12,6 @@ #ifndef _CONFIG_DOCKSTAR_H #define _CONFIG_DOCKSTAR_H

- /* * Version number information */ diff --git a/include/configs/draco.h b/include/configs/draco.h index acefd3e..2d4a45d 100644 --- a/include/configs/draco.h +++ b/include/configs/draco.h @@ -67,7 +67,6 @@ #define CONFIG_ENV_SIZE_REDUND 0x2000 #define CONFIG_ENV_RANGE (4 * CONFIG_SYS_ENV_SECT_SIZE)

- #define MTDPARTS_DEFAULT MTDPARTS_DEFAULT_V2

#ifndef CONFIG_SPL_BUILD @@ -95,7 +94,6 @@ "run nand_boot_backup;" \ "reset;"

- #else #define CONFIG_BOOTDELAY 0

diff --git a/include/configs/dragonboard410c.h b/include/configs/dragonboard410c.h index ae4fbb4..42fb0f3 100644 --- a/include/configs/dragonboard410c.h +++ b/include/configs/dragonboard410c.h @@ -99,7 +99,6 @@ "tftp $loadaddr "#file" && " \ "mmc write $loadaddr $start $size && "

- #define CONFIG_ENV_REFLASH \ "mmc dev 0 && "\ "usb start && "\ diff --git a/include/configs/duovero.h b/include/configs/duovero.h index ac9a67f..d8f48ef 100644 --- a/include/configs/duovero.h +++ b/include/configs/duovero.h @@ -39,7 +39,6 @@

#define CONFIG_SYS_ENABLE_PADS_ALL

- #define CONFIG_SMC911X #define CONFIG_SMC911X_32_BIT #define CONFIG_SMC911X_BASE 0x2C000000 diff --git a/include/configs/ea20.h b/include/configs/ea20.h index 06e988a..b52f34b 100644 --- a/include/configs/ea20.h +++ b/include/configs/ea20.h @@ -24,7 +24,6 @@ #define CONFIG_VIDEO #define CONFIG_PREBOOT

- /* * SoC Configuration */ @@ -102,7 +101,6 @@ #define CONFIG_SYS_NO_FLASH #endif

- #if defined(CONFIG_VIDEO) #define CONFIG_VIDEO_DA8XX #define CONFIG_CFB_CONSOLE diff --git a/include/configs/eco5pk.h b/include/configs/eco5pk.h index f463521..bb5d7e5 100644 --- a/include/configs/eco5pk.h +++ b/include/configs/eco5pk.h @@ -58,5 +58,4 @@ "mtdparts="MTDPARTS_DEFAULT"\0" \ "serverip=192.168.142.60\0"

- #endif /* __CONFIG_H */ diff --git a/include/configs/edb93xx.h b/include/configs/edb93xx.h index ce50973..c64d119 100644 --- a/include/configs/edb93xx.h +++ b/include/configs/edb93xx.h @@ -25,7 +25,6 @@ #error "no board defined" #endif

- /* Initial environment and monitor configuration options. */ #define CONFIG_BOOTDELAY 2 #define CONFIG_CMDLINE_TAG 1 @@ -34,8 +33,6 @@ #define CONFIG_BOOTARGS "root=/dev/nfs console=ttyAM0,115200 ip=dhcp" #define CONFIG_BOOTFILE "edb93xx.img"

- - #define CONFIG_SYS_LDSCRIPT "board/cirrus/edb93xx/u-boot.lds"

#ifdef CONFIG_EDB9301 @@ -160,7 +157,6 @@ #error "no SDCS configuration for this board" #endif

- #if defined(CONFIG_EDB93XX_SDCS3) #define CONFIG_SYS_LOAD_ADDR 0x01000000 /* Default load address */ #define PHYS_SDRAM_1 0x00000000 @@ -175,7 +171,6 @@ #define CONFIG_SYS_INIT_SP_ADDR \ (CONFIG_SYS_SDRAM_BASE + 32*1024 - GENERATED_GBL_DATA_SIZE)

- /* Must match kernel config */ #define LINUX_BOOT_PARAM_ADDR (PHYS_SDRAM_1 + 0x100)

@@ -214,7 +209,6 @@ #define CONFIG_SYS_FLASH_CFI #define CONFIG_SYS_FLASH_USE_BUFFER_WRITE

- #define CONFIG_SYS_FLASH_PROTECTION #define CONFIG_FLASH_CFI_DRIVER #define CONFIG_SYS_MAX_FLASH_BANKS 1 diff --git a/include/configs/ethernut5.h b/include/configs/ethernut5.h index 28bf6b5..cfb009c 100644 --- a/include/configs/ethernut5.h +++ b/include/configs/ethernut5.h @@ -12,7 +12,6 @@

#include <asm/hardware.h>

- /* The first stage boot loader expects u-boot running at this address. */ #define CONFIG_SYS_TEXT_BASE 0x27000000 /* 16MB available */

diff --git a/include/configs/exynos-common.h b/include/configs/exynos-common.h index 852829c..0a2d610 100644 --- a/include/configs/exynos-common.h +++ b/include/configs/exynos-common.h @@ -16,7 +16,6 @@ #include <asm/arch/cpu.h> /* get chip and board defs */ #include <linux/sizes.h>

- #define CONFIG_ARCH_CPU_INIT #define CONFIG_DISPLAY_CPUINFO #define CONFIG_DISPLAY_BOARDINFO diff --git a/include/configs/exynos5-common.h b/include/configs/exynos5-common.h index 97fcd4a..b2ff4dd 100644 --- a/include/configs/exynos5-common.h +++ b/include/configs/exynos5-common.h @@ -155,7 +155,6 @@

/* Enable Time Command */

- /* USB */ #define CONFIG_USB_STORAGE #define CONFIG_USB_XHCI_DWC3 diff --git a/include/configs/flea3.h b/include/configs/flea3.h index 54b9315..e74aa68 100644 --- a/include/configs/flea3.h +++ b/include/configs/flea3.h @@ -87,7 +87,6 @@

#define CONFIG_LOADADDR 0x80800000 /* loadaddr env var */

- /* * Ethernet on SOC (FEC) */ diff --git a/include/configs/goflexhome.h b/include/configs/goflexhome.h index 243e19f..d0432ad 100644 --- a/include/configs/goflexhome.h +++ b/include/configs/goflexhome.h @@ -15,7 +15,6 @@ #ifndef _CONFIG_GOFLEXHOME_H #define _CONFIG_GOFLEXHOME_H

- /* * Version number information */ diff --git a/include/configs/grsim_leon2.h b/include/configs/grsim_leon2.h index e06e261..ab1e11d 100644 --- a/include/configs/grsim_leon2.h +++ b/include/configs/grsim_leon2.h @@ -189,7 +189,6 @@ #undef CONFIG_SYS_SRAM_BASE #undef CONFIG_SYS_SRAM_SIZE

- /* Always Run U-Boot from SDRAM */ #define CONFIG_SYS_RAM_BASE CONFIG_SYS_SDRAM_BASE #define CONFIG_SYS_RAM_SIZE CONFIG_SYS_SDRAM_SIZE diff --git a/include/configs/guruplug.h b/include/configs/guruplug.h index 712bfd7..5907e98 100644 --- a/include/configs/guruplug.h +++ b/include/configs/guruplug.h @@ -10,7 +10,6 @@ #ifndef _CONFIG_GURUPLUG_H #define _CONFIG_GURUPLUG_H

- /* * Version number information */ diff --git a/include/configs/h2200.h b/include/configs/h2200.h index 1bb5ebb..3d510d6 100644 --- a/include/configs/h2200.h +++ b/include/configs/h2200.h @@ -135,7 +135,6 @@ #define CONFIG_USB_DEV_PULLUP_GPIO 33 /* USB VBUS GPIO 3 */

- #define CONFIG_BOOTDELAY 2 #define CONFIG_BOOTCOMMAND \ "setenv downloaded 0 ; while test $downloaded -eq 0 ; do " \ diff --git a/include/configs/highbank.h b/include/configs/highbank.h index 510741b..3bce12b 100644 --- a/include/configs/highbank.h +++ b/include/configs/highbank.h @@ -69,7 +69,6 @@ #define CONFIG_SYS_LOAD_ADDR 0x800000 #define CONFIG_SYS_64BIT_LBA

- /*----------------------------------------------------------------------- * Physical Memory Map * The DRAM is already setup, so do not touch the DT node later. diff --git a/include/configs/hikey.h b/include/configs/hikey.h index 4987373..d08ab1d 100644 --- a/include/configs/hikey.h +++ b/include/configs/hikey.h @@ -123,7 +123,6 @@ "initrd_high=0xffffffffffffffff\0" \ BOOTENV

- /* Preserve enviroment on sd card */ #define CONFIG_COMMAND_HISTORY

diff --git a/include/configs/hrcon.h b/include/configs/hrcon.h index aecfda4..d59d21f 100644 --- a/include/configs/hrcon.h +++ b/include/configs/hrcon.h @@ -26,7 +26,6 @@ #define CONFIG_IDENT_STRING " hrcon 0.01" #endif

- #define CONFIG_BOARD_EARLY_INIT_F #define CONFIG_BOARD_EARLY_INIT_R #define CONFIG_LAST_STAGE_INIT @@ -665,5 +664,4 @@ void fpga_control_clear(unsigned int bus, int pin);

#define CONFIG_BOOTCOMMAND CONFIG_MMCBOOTCOMMAND

- #endif /* __CONFIG_H */ diff --git a/include/configs/ibf-dsp561.h b/include/configs/ibf-dsp561.h index 7cb2346..4cd0f77 100644 --- a/include/configs/ibf-dsp561.h +++ b/include/configs/ibf-dsp561.h @@ -7,14 +7,12 @@

#include <asm/config-pre.h>

- /* * Processor Settings */ #define CONFIG_BFIN_CPU bf561-0.5 #define CONFIG_BFIN_BOOT_MODE BFIN_BOOT_BYPASS

- /* * Clock Settings * CCLK = (CLKIN * VCO_MULT) / CCLK_DIV @@ -38,7 +36,6 @@ /* Values can range from 1-15 */ #define CONFIG_SCLK_DIV 5

- /* * Memory Settings */ @@ -56,7 +53,6 @@ #define CONFIG_SYS_MONITOR_LEN (256 * 1024) #define CONFIG_SYS_MALLOC_LEN (128 * 1024)

- /* * Network Settings */ @@ -65,7 +61,6 @@ #define AX88180_BASE 0x2c000000 #define CONFIG_HOSTNAME ibf-dsp561

- /* * Flash Settings */ @@ -99,7 +94,6 @@ common/env_embedded.o (.text*); #endif

- /* * I2C Settings */ @@ -113,7 +107,6 @@ */ #define CONFIG_UART_CONSOLE 0

- /* * Pull in common ADI header for remaining command/environment setup */ diff --git a/include/configs/iconnect.h b/include/configs/iconnect.h index 10f1e9b..c156bd3 100644 --- a/include/configs/iconnect.h +++ b/include/configs/iconnect.h @@ -9,7 +9,6 @@ #ifndef _CONFIG_ICONNECT_H #define _CONFIG_ICONNECT_H

- /* * Version number information */ diff --git a/include/configs/ids8313.h b/include/configs/ids8313.h index ff93c7d..da4cba7 100644 --- a/include/configs/ids8313.h +++ b/include/configs/ids8313.h @@ -19,7 +19,6 @@ #define CONFIG_MPC8313 #define CONFIG_IDS8313

- #define CONFIG_FSL_ELBC

#define CONFIG_MISC_INIT_R @@ -442,7 +441,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" diff --git a/include/configs/imx31_phycore.h b/include/configs/imx31_phycore.h index 94dd796..94fc077 100644 --- a/include/configs/imx31_phycore.h +++ b/include/configs/imx31_phycore.h @@ -18,7 +18,6 @@ #define CONFIG_MX31 /* This is a mx31 */ #define CONFIG_MX31_CLK32 32000

- #define CONFIG_DISPLAY_CPUINFO #define CONFIG_DISPLAY_BOARDINFO

@@ -92,7 +91,6 @@ "pclk:185925,le:9,ri:17,up:7,lo:10,hs:1,vs:1," \ "sync:1241513985,vmode:0\0"

- #define CONFIG_SMC911X #define CONFIG_SMC911X_BASE 0xa8000000 #define CONFIG_SMC911X_32_BIT diff --git a/include/configs/inka4x0.h b/include/configs/inka4x0.h index 149c8c6..282cc25 100644 --- a/include/configs/inka4x0.h +++ b/include/configs/inka4x0.h @@ -68,7 +68,6 @@ #define CONFIG_DOS_PARTITION #define CONFIG_ISO_PARTITION

- /* * BOOTP options */ @@ -77,7 +76,6 @@ #define CONFIG_BOOTP_GATEWAY #define CONFIG_BOOTP_HOSTNAME

- /* * Command line configuration. */ diff --git a/include/configs/integrator-common.h b/include/configs/integrator-common.h index f4982e1..b95851a 100644 --- a/include/configs/integrator-common.h +++ b/include/configs/integrator-common.h @@ -73,7 +73,6 @@ */ /* #define SKIP_CONFIG_RELOCATE_UBOOT */

- /* * Physical Memory Map */ diff --git a/include/configs/integratorap.h b/include/configs/integratorap.h index c80e915..a5a8819 100644 --- a/include/configs/integratorap.h +++ b/include/configs/integratorap.h @@ -28,7 +28,6 @@ #define CONFIG_BOOTP_GATEWAY #define CONFIG_BOOTP_HOSTNAME

- /* * Command line configuration. */ @@ -54,7 +53,6 @@ #define CONFIG_EEPRO100 #define CONFIG_SYS_RX_ETH_BUFFER 8 /* use 8 rx buffer on eepro100 */

- /*----------------------------------------------------------------------- * There are various dependencies on the core module (CM) fitted * Users should refer to their CM user guide diff --git a/include/configs/intip.h b/include/configs/intip.h index 69f0f4d..6f48b4b 100644 --- a/include/configs/intip.h +++ b/include/configs/intip.h @@ -309,7 +309,6 @@ #define CONFIG_SYS_PCI_SUBSYS_VENDORID 0x1014 /* IBM */ #define CONFIG_SYS_PCI_SUBSYS_DEVICEID 0xcafe /* Whatever */

- /* * External Bus Controller (EBC) Setup */ @@ -324,7 +323,6 @@ * 0xfc00.0000 -> 4.cc00.0000 */

- /* Memory Bank 0 (NOR-FLASH) initialization */ #define CONFIG_SYS_EBC_PB0AP 0x10055e00 #define CONFIG_SYS_EBC_PB0CR (CONFIG_SYS_BOOT_BASE_ADDR | 0x9a000) diff --git a/include/configs/ip04.h b/include/configs/ip04.h index 3638648..4a9093c 100644 --- a/include/configs/ip04.h +++ b/include/configs/ip04.h @@ -16,14 +16,12 @@

#include <asm/config-pre.h>

- /* * Processor Settings */ #define CONFIG_BFIN_CPU bf532-0.5 #define CONFIG_BFIN_BOOT_MODE BFIN_BOOT_NAND

- /* * Clock Settings * CCLK = (CLKIN * VCO_MULT) / CCLK_DIV @@ -47,7 +45,6 @@ /* Values can range from 1-15 */ #define CONFIG_SCLK_DIV 3

- /* * Memory Settings */ @@ -64,7 +61,6 @@ #define CONFIG_SYS_MONITOR_LEN (384 * 1024) #define CONFIG_SYS_MALLOC_LEN (128 * 1024)

- /* * Network Settings */ @@ -77,14 +73,12 @@ #define DM9000_IO CONFIG_DM9000_BASE #define DM9000_DATA (CONFIG_DM9000_BASE + 2)

- /* * Flash Settings */ #define CONFIG_ENV_OVERWRITE 1 #define CONFIG_SYS_NO_FLASH /* we have only NAND */

- /* * SPI Settings */ @@ -92,7 +86,6 @@ #define CONFIG_ENV_SPI_MAX_HZ 30000000 #define CONFIG_SF_DEFAULT_SPEED 30000000

- /* * Env Storage Settings */ @@ -102,7 +95,6 @@ #define CONFIG_ENV_SIZE 0x10000 #define CONFIG_ENV_SECT_SIZE 0x10000

- /* * NAND Settings */ @@ -122,7 +114,6 @@ #define NAND_PLAT_WRITE_ADR(chip, cmd) BFIN_NAND_WRITE(BFIN_NAND_ALE(chip), cmd) #define NAND_PLAT_GPIO_DEV_READY GPIO_PF10

- /* * Misc Settings */ @@ -134,7 +125,6 @@ #define CONFIG_BOOT_RETRY_TIME -1 #define CONFIG_BOOTCOMMAND "run nandboot"

- /* * Pull in common ADI header for remaining command/environment setup */ diff --git a/include/configs/ipam390.h b/include/configs/ipam390.h index 869d8c4..3675099 100644 --- a/include/configs/ipam390.h +++ b/include/configs/ipam390.h @@ -90,7 +90,6 @@ #define CONFIG_SYS_DA850_DDR2_SDBCR2 0x00000004 #define CONFIG_SYS_DA850_DDR2_PBBPR 0x00000020

- #define CONFIG_SYS_DA850_DDR2_SDTIMR ( \ (13 << DV_DDR_SDTMR1_RFC_SHIFT) | \ (2 << DV_DDR_SDTMR1_RP_SHIFT) | \ @@ -129,7 +128,6 @@ DAVINCI_ABCR_TA(0) | \ DAVINCI_ABCR_ASIZE_8BIT)

- /* * Serial Driver info */ diff --git a/include/configs/jupiter.h b/include/configs/jupiter.h index ce92e78..0628203 100644 --- a/include/configs/jupiter.h +++ b/include/configs/jupiter.h @@ -73,7 +73,6 @@

#define CONFIG_TIMESTAMP /* Print image info with timestamp */

- /* * BOOTP options */ @@ -82,7 +81,6 @@ #define CONFIG_BOOTP_GATEWAY #define CONFIG_BOOTP_HOSTNAME

- /* * Command line configuration. */ @@ -91,7 +89,6 @@ #define CODFIG_CMD_PCI #endif

- /* * Autobooting */ @@ -203,7 +200,6 @@ #define CONFIG_SYS_INIT_RAM_ADDR MPC5XXX_SRAM #define CONFIG_SYS_INIT_RAM_SIZE MPC5XXX_SRAM_SIZE /* Size of used area in DPRAM */

- #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

diff --git a/include/configs/kc1.h b/include/configs/kc1.h index 15029f9..30be533 100644 --- a/include/configs/kc1.h +++ b/include/configs/kc1.h @@ -80,7 +80,6 @@ #define CONFIG_SYS_I2C_OMAP24XX #define CONFIG_I2C_MULTI_BUS

- /* * Flash */ diff --git a/include/configs/km8360.h b/include/configs/km8360.h index 49b9200..c8039e1 100644 --- a/include/configs/km8360.h +++ b/include/configs/km8360.h @@ -233,7 +233,6 @@

#define CONFIG_SYS_DBAT5U CONFIG_SYS_IBAT5U

- #ifdef CONFIG_KMCOGE5NE /* BFTIC3: icache cacheable, but dcache-inhibit and guarded */ #define CONFIG_SYS_IBAT6L (\ diff --git a/include/configs/km_kirkwood.h b/include/configs/km_kirkwood.h index a445aaf..b377c41 100644 --- a/include/configs/km_kirkwood.h +++ b/include/configs/km_kirkwood.h @@ -180,5 +180,4 @@ #undef CONFIG_KIRKWOOD_PCIE_INIT #endif

- #endif /* _CONFIG_KM_KIRKWOOD */ diff --git a/include/configs/legoev3.h b/include/configs/legoev3.h index a2a337d..54563e3 100644 --- a/include/configs/legoev3.h +++ b/include/configs/legoev3.h @@ -31,7 +31,6 @@

#define CONFIG_SYS_TEXT_BASE 0xc1080000

- /* * Memory Info */ @@ -218,7 +217,6 @@ #define CONFIG_CLOCKS #endif

- #define CONFIG_ENV_IS_NOWHERE #define CONFIG_SYS_NO_FLASH #define CONFIG_ENV_SIZE (16 << 10) diff --git a/include/configs/ls1043aqds.h b/include/configs/ls1043aqds.h index 5c3ece8..3bdece7 100644 --- a/include/configs/ls1043aqds.h +++ b/include/configs/ls1043aqds.h @@ -114,7 +114,6 @@ unsigned long get_board_ddr_clk(void); #define CONFIG_DOS_PARTITION #define CONFIG_BOARD_LATE_INIT

- /* EEPROM */ #define CONFIG_ID_EEPROM #define CONFIG_SYS_I2C_EEPROM_NXID diff --git a/include/configs/ls2080a_common.h b/include/configs/ls2080a_common.h index 648a6ff..8b75088 100644 --- a/include/configs/ls2080a_common.h +++ b/include/configs/ls2080a_common.h @@ -7,7 +7,6 @@ #ifndef __LS2_COMMON_H #define __LS2_COMMON_H

- #define CONFIG_REMAKE_ELF #define CONFIG_FSL_LAYERSCAPE #define CONFIG_FSL_LSCH3 @@ -15,7 +14,6 @@ #define CONFIG_GICV3 #define CONFIG_FSL_TZPC_BP147

- #include <asm/arch/ls2080a_stream_id.h> #include <asm/arch/config.h> #if (defined(CONFIG_SYS_FSL_SRDS_1) || defined(CONFIG_SYS_FSL_SRDS_2)) @@ -297,5 +295,4 @@ unsigned long long get_qixis_addr(void);

#define CONFIG_SYS_BOOTM_LEN (64 << 20) /* Increase max gunzip size */

- #endif /* __LS2_COMMON_H */ diff --git a/include/configs/ls2080a_simu.h b/include/configs/ls2080a_simu.h index 0dbe95f..924011c 100644 --- a/include/configs/ls2080a_simu.h +++ b/include/configs/ls2080a_simu.h @@ -72,7 +72,6 @@ #define CONFIG_SYS_NAND_MAX_ECCPOS 256 #define CONFIG_SYS_NAND_MAX_OOBFREE 2

- #define CONFIG_SYS_NAND_CSPR_EXT (0x0) #define CONFIG_SYS_NAND_CSPR (CSPR_PHYS_ADDR(CONFIG_SYS_NAND_BASE_PHYS) \ | CSPR_PORT_SIZE_8 /* Port Size = 8 bit */ \ diff --git a/include/configs/ls2080aqds.h b/include/configs/ls2080aqds.h index c40f0f2..3ec4bb6 100644 --- a/include/configs/ls2080aqds.h +++ b/include/configs/ls2080aqds.h @@ -119,7 +119,6 @@ unsigned long get_board_ddr_clk(void); #define CONFIG_SYS_NAND_MAX_ECCPOS 256 #define CONFIG_SYS_NAND_MAX_OOBFREE 2

- #define CONFIG_SYS_NAND_CSPR_EXT (0x0) #define CONFIG_SYS_NAND_CSPR (CSPR_PHYS_ADDR(CONFIG_SYS_NAND_BASE_PHYS) \ | CSPR_PORT_SIZE_8 /* Port Size = 8 bit */ \ diff --git a/include/configs/ls2080ardb.h b/include/configs/ls2080ardb.h index 4aed2de..8ba0512 100644 --- a/include/configs/ls2080ardb.h +++ b/include/configs/ls2080ardb.h @@ -127,7 +127,6 @@ unsigned long get_board_sys_clk(void); #define CONFIG_SYS_NAND_MAX_ECCPOS 256 #define CONFIG_SYS_NAND_MAX_OOBFREE 2

- #define CONFIG_SYS_NAND_CSPR_EXT (0x0) #define CONFIG_SYS_NAND_CSPR (CSPR_PHYS_ADDR(CONFIG_SYS_NAND_BASE_PHYS) \ | CSPR_PORT_SIZE_8 /* Port Size = 8 bit */ \ diff --git a/include/configs/lsxl.h b/include/configs/lsxl.h index 0ce422e..094a7e2 100644 --- a/include/configs/lsxl.h +++ b/include/configs/lsxl.h @@ -8,7 +8,6 @@ #ifndef _CONFIG_LSXL_H #define _CONFIG_LSXL_H

- /* * Version number information */ @@ -75,8 +74,6 @@ #undef CONFIG_SF_DEFAULT_SPEED #define CONFIG_SF_DEFAULT_SPEED 25000000

- - /* * Environment variables configurations */ diff --git a/include/configs/lwmon5.h b/include/configs/lwmon5.h index 0b1788f..3dc59e4 100644 --- a/include/configs/lwmon5.h +++ b/include/configs/lwmon5.h @@ -23,7 +23,6 @@ #define CONFIG_440EPX 1 /* Specific PPC440EPx */ #define CONFIG_440 1 /* ... PPC440 family */

- #define CONFIG_SYS_TEXT_BASE 0xFFF80000 #define CONFIG_HOSTNAME lwmon5

@@ -425,7 +424,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 diff --git a/include/configs/m28evk.h b/include/configs/m28evk.h index 0a537ce..2070f33 100644 --- a/include/configs/m28evk.h +++ b/include/configs/m28evk.h @@ -36,7 +36,6 @@ #define CONFIG_CMD_NAND_TRIMFFS #define CONFIG_VIDEO

- /* Memory configuration */ #define CONFIG_NR_DRAM_BANKS 1 /* 1 bank of DRAM */ #define PHYS_SDRAM_1 0x40000000 /* Base address */ diff --git a/include/configs/m53evk.h b/include/configs/m53evk.h index 600eea0..9ababa3 100644 --- a/include/configs/m53evk.h +++ b/include/configs/m53evk.h @@ -43,7 +43,6 @@ #define CONFIG_CMD_SATA #define CONFIG_VIDEO

- /* * Memory configurations */ diff --git a/include/configs/mcx.h b/include/configs/mcx.h index 01f1d83..d12f291 100644 --- a/include/configs/mcx.h +++ b/include/configs/mcx.h @@ -25,7 +25,6 @@ #define CONFIG_MACH_TYPE MACH_TYPE_MCX #define CONFIG_BOARD_LATE_INIT

- #define CONFIG_SYS_CACHELINE_SIZE 64

#define CONFIG_EMIF4 /* The chip has EMIF4 controller */ diff --git a/include/configs/mecp5123.h b/include/configs/mecp5123.h index 46453c4..cca7c33 100644 --- a/include/configs/mecp5123.h +++ b/include/configs/mecp5123.h @@ -242,7 +242,6 @@ #define SCCR2_CLOCKS_EN (CLOCK_SCCR2_MEM_EN | \ CLOCK_SCCR2_I2C_EN)

- #define CONFIG_CMDLINE_EDITING 1 /* add command line history */

/* I2C */ diff --git a/include/configs/meesc.h b/include/configs/meesc.h index e7d2694..d65a4cd 100644 --- a/include/configs/meesc.h +++ b/include/configs/meesc.h @@ -86,7 +86,6 @@ * Command line configuration. */

- #ifdef CONFIG_SYS_USE_NANDFLASH #define CONFIG_CMD_NAND #endif diff --git a/include/configs/minnowmax.h b/include/configs/minnowmax.h index e0006d8..93d34e9 100644 --- a/include/configs/minnowmax.h +++ b/include/configs/minnowmax.h @@ -28,7 +28,6 @@ {PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_VALLEYVIEW_SATA}, \ {PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_VALLEYVIEW_SATA_ALT}

- #define CONFIG_MMC #define CONFIG_SDHCI #define CONFIG_GENERIC_MMC diff --git a/include/configs/mpc5121ads.h b/include/configs/mpc5121ads.h index 9cc940c..2179f60 100644 --- a/include/configs/mpc5121ads.h +++ b/include/configs/mpc5121ads.h @@ -332,7 +332,6 @@ #define CONFIG_SYS_PCI_IO_PHYS 0x84000000 #define CONFIG_SYS_PCI_IO_SIZE 0x01000000 /* 16M */

- #define CONFIG_PCI_PNP /* do pci plug-and-play */

#define CONFIG_PCI_SCAN_SHOW /* show pci devices on startup */ @@ -450,7 +449,6 @@ "1m(u-boot);" \ "mpc5121.nand:-(data)"

- #if defined(CONFIG_CMD_IDE) || defined(CONFIG_CMD_EXT2) || defined(CONFIG_CMD_USB)

#define CONFIG_DOS_PARTITION @@ -483,7 +481,6 @@ #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 */ diff --git a/include/configs/ms7720se.h b/include/configs/ms7720se.h index 3e99966..5b6880b 100644 --- a/include/configs/ms7720se.h +++ b/include/configs/ms7720se.h @@ -57,7 +57,6 @@ #define CONFIG_SYS_MALLOC_LEN (256 * 1024) #define CONFIG_SYS_BOOTMAPSZ (8 * 1024 * 1024)

- /* FLASH */ #define CONFIG_SYS_FLASH_CFI #define CONFIG_FLASH_CFI_DRIVER diff --git a/include/configs/ms7750se.h b/include/configs/ms7750se.h index bbd2d6b..025a4a6 100644 --- a/include/configs/ms7750se.h +++ b/include/configs/ms7750se.h @@ -64,7 +64,6 @@ #undef CONFIG_SYS_FLASH_QUIET_TEST #define CONFIG_SYS_FLASH_EMPTY_INFO /* print 'E' for empty sector on flinfo */

- #define CONFIG_ENV_IS_IN_FLASH #define CONFIG_ENV_SECT_SIZE 0x20000 #define CONFIG_ENV_SIZE (CONFIG_ENV_SECT_SIZE) diff --git a/include/configs/mv-plug-common.h b/include/configs/mv-plug-common.h index 496bc1f..116c821 100644 --- a/include/configs/mv-plug-common.h +++ b/include/configs/mv-plug-common.h @@ -8,7 +8,6 @@ #ifndef _CONFIG_MARVELL_PLUG_H #define _CONFIG_MARVELL_PLUG_H

- /* * High Level Configuration Options (easy to change) */ diff --git a/include/configs/mx31ads.h b/include/configs/mx31ads.h index 78aa22b..b9992de 100644 --- a/include/configs/mx31ads.h +++ b/include/configs/mx31ads.h @@ -14,7 +14,6 @@ /* High Level Configuration Options */ #define CONFIG_MX31 1 /* This is a mx31 */

- #define CONFIG_DISPLAY_CPUINFO #define CONFIG_DISPLAY_BOARDINFO

@@ -154,7 +153,6 @@ #define CONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR + CONFIG_ENV_SIZE) #define CONFIG_ENV_SIZE_REDUND CONFIG_ENV_SIZE

- /*----------------------------------------------------------------------- * CFI FLASH driver setup */ diff --git a/include/configs/mx31pdk.h b/include/configs/mx31pdk.h index 75d24bf..797eb09 100644 --- a/include/configs/mx31pdk.h +++ b/include/configs/mx31pdk.h @@ -19,7 +19,6 @@ /* High Level Configuration Options */ #define CONFIG_MX31 /* This is a mx31 */

- #define CONFIG_DISPLAY_CPUINFO #define CONFIG_DISPLAY_BOARDINFO

@@ -175,7 +174,6 @@ #define CONFIG_SYS_NAND_SIZE (256 * 1024 * 1024) #define CONFIG_SYS_NAND_BAD_BLOCK_POS 0

- /* Configuration of lowlevel_init.S (clocks and SDRAM) */ #define CCM_CCMR_SETUP 0x074B0BF5 #define CCM_PDR0_SETUP_532MHZ (PDR0_CSI_PODF(0x3f) | PDR0_CSI_PRDF(7) | \ diff --git a/include/configs/mx35pdk.h b/include/configs/mx35pdk.h index 9e736eb..5f4142a 100644 --- a/include/configs/mx35pdk.h +++ b/include/configs/mx35pdk.h @@ -48,7 +48,6 @@ #define CONFIG_MXC_SPI #define CONFIG_MXC_GPIO

- /* * PMIC Configs */ diff --git a/include/configs/mx53ard.h b/include/configs/mx53ard.h index 0eb5203..48b4dca 100644 --- a/include/configs/mx53ard.h +++ b/include/configs/mx53ard.h @@ -221,7 +221,6 @@ #define CONFIG_ENV_IS_IN_MMC #define CONFIG_SYS_MMC_ENV_DEV 0

- #define MX53ARD_CS1GCR1 (CSEN | DSZ(2)) #define MX53ARD_CS1RCR1 (RCSN(2) | OEN (1) | RWSC(22)) #define MX53ARD_CS1RCR2 RBEN(2) diff --git a/include/configs/mx6sabre_common.h b/include/configs/mx6sabre_common.h index 072003c..d777666 100644 --- a/include/configs/mx6sabre_common.h +++ b/include/configs/mx6sabre_common.h @@ -164,7 +164,6 @@ "echo WARNING: Could not determine dtb to use; fi; " \ "fi;\0" \

- #define CONFIG_BOOTCOMMAND \ "run findfdt;" \ "mmc dev ${mmcdev};" \ diff --git a/include/configs/mx6sxsabreauto.h b/include/configs/mx6sxsabreauto.h index 14acea9..9617e24 100644 --- a/include/configs/mx6sxsabreauto.h +++ b/include/configs/mx6sxsabreauto.h @@ -6,13 +6,11 @@ * SPDX-License-Identifier: GPL-2.0+ */

- #ifndef __CONFIG_H #define __CONFIG_H

#include "mx6_common.h"

- /* Size of malloc() pool */ #define CONFIG_SYS_MALLOC_LEN (3 * SZ_1M)

@@ -164,7 +162,6 @@ #define CONFIG_PHYLIB #define CONFIG_PHY_ATHEROS

- #ifdef CONFIG_CMD_USB #define CONFIG_USB_EHCI #define CONFIG_USB_EHCI_MX6 @@ -179,7 +176,6 @@

#define CONFIG_IMX_THERMAL

- #define CONFIG_FSL_QSPI #ifdef CONFIG_FSL_QSPI #define CONFIG_SYS_FSL_QSPI_AHB diff --git a/include/configs/mx6sxsabresd.h b/include/configs/mx6sxsabresd.h index c28a747..71b9fe3 100644 --- a/include/configs/mx6sxsabresd.h +++ b/include/configs/mx6sxsabresd.h @@ -6,7 +6,6 @@ * SPDX-License-Identifier: GPL-2.0+ */

- #ifndef __CONFIG_H #define __CONFIG_H

@@ -175,7 +174,6 @@ #define CONFIG_PHYLIB #define CONFIG_PHY_ATHEROS

- #ifdef CONFIG_CMD_USB #define CONFIG_USB_EHCI #define CONFIG_USB_EHCI_MX6 @@ -200,8 +198,6 @@

#define CONFIG_IMX_THERMAL

- - #ifdef CONFIG_FSL_QSPI #define CONFIG_SYS_FSL_QSPI_LE #define CONFIG_SYS_FSL_QSPI_AHB diff --git a/include/configs/mx6ul_14x14_evk.h b/include/configs/mx6ul_14x14_evk.h index eb92138..fa79d48 100644 --- a/include/configs/mx6ul_14x14_evk.h +++ b/include/configs/mx6ul_14x14_evk.h @@ -8,7 +8,6 @@ #ifndef __MX6UL_14X14_EVK_CONFIG_H #define __MX6UL_14X14_EVK_CONFIG_H

- #include <asm/arch/imx-regs.h> #include <linux/sizes.h> #include "mx6_common.h" diff --git a/include/configs/neo.h b/include/configs/neo.h index 3121c03..4f244a9 100644 --- a/include/configs/neo.h +++ b/include/configs/neo.h @@ -8,7 +8,6 @@ #ifndef __CONFIG_H #define __CONFIG_H

- #define CONFIG_405EP 1 /* this is a PPC405 CPU */ #define CONFIG_NEO 1 /* on a Neo board */

diff --git a/include/configs/nitrogen6x.h b/include/configs/nitrogen6x.h index 7696b53..9f16da7 100644 --- a/include/configs/nitrogen6x.h +++ b/include/configs/nitrogen6x.h @@ -320,7 +320,6 @@ #define CONFIG_PCIE_IMX #endif

- #define CONFIG_CMD_USB_MASS_STORAGE #define CONFIG_USB_FUNCTION_MASS_STORAGE

diff --git a/include/configs/odroid.h b/include/configs/odroid.h index 0b691e4..3e2bcec 100644 --- a/include/configs/odroid.h +++ b/include/configs/odroid.h @@ -191,7 +191,6 @@ #define CONFIG_EXYNOS_ACE_SHA #define CONFIG_LIB_HW_RAND

- /* USB */ #define CONFIG_USB_EHCI #define CONFIG_USB_EHCI_EXYNOS diff --git a/include/configs/omap3_igep00x0.h b/include/configs/omap3_igep00x0.h index 8e438e9..cfe7012 100644 --- a/include/configs/omap3_igep00x0.h +++ b/include/configs/omap3_igep00x0.h @@ -92,7 +92,6 @@

#include <config_distro_bootcmd.h>

- #define CONFIG_EXTRA_ENV_SETTINGS \ ENV_DEVICE_SETTINGS \ MEM_LAYOUT_SETTINGS \ diff --git a/include/configs/omap3_logic.h b/include/configs/omap3_logic.h index 9aaab01..ab83714 100644 --- a/include/configs/omap3_logic.h +++ b/include/configs/omap3_logic.h @@ -282,7 +282,6 @@ #define CONFIG_ENV_OFFSET SMNAND_ENV_OFFSET #define CONFIG_ENV_ADDR SMNAND_ENV_OFFSET

- /* SMSC922x Ethernet */ #if defined(CONFIG_CMD_NET) #define CONFIG_SMC911X diff --git a/include/configs/omap3_zoom1.h b/include/configs/omap3_zoom1.h index e9e8da8..99d9fc3 100644 --- a/include/configs/omap3_zoom1.h +++ b/include/configs/omap3_zoom1.h @@ -77,7 +77,6 @@ #define CONFIG_CMD_NAND_LOCK_UNLOCK /* Enable lock/unlock support */ #endif

- #undef CONFIG_SYS_I2C_OMAP24XX #define CONFIG_SYS_I2C_OMAP34XX

diff --git a/include/configs/omap4_panda.h b/include/configs/omap4_panda.h index 3e7096e..0d62ccd 100644 --- a/include/configs/omap4_panda.h +++ b/include/configs/omap4_panda.h @@ -32,7 +32,6 @@

#define CONFIG_UBOOT_ENABLE_PADS_ALL

- #include <configs/ti_omap4_common.h>

/* GPIO */ diff --git a/include/configs/openrisc-generic.h b/include/configs/openrisc-generic.h index f7c3aaa..ffed6c5 100644 --- a/include/configs/openrisc-generic.h +++ b/include/configs/openrisc-generic.h @@ -128,5 +128,4 @@ #define CONFIG_BOOTP_GATEWAY #define CONFIG_BOOTP_HOSTNAME

- #endif /* __CONFIG_H */ diff --git a/include/configs/ot1200.h b/include/configs/ot1200.h index 100d634..9b5c369 100644 --- a/include/configs/ot1200.h +++ b/include/configs/ot1200.h @@ -78,7 +78,6 @@ #define CONFIG_LIBATA #endif

- /* SPL */ #ifdef CONFIG_SPL #include "imx6_spl.h" diff --git a/include/configs/p1_p2_rdb_pc.h b/include/configs/p1_p2_rdb_pc.h index 5e63b0c..fba61a4 100644 --- a/include/configs/p1_p2_rdb_pc.h +++ b/include/configs/p1_p2_rdb_pc.h @@ -434,7 +434,6 @@ * 0xffe0_0000 0xffef_ffff CCSR 1M non-cacheable */

- /* * Local Bus Definitions */ @@ -449,7 +448,6 @@ #define CONFIG_SYS_FLASH_BASE 0xef000000 #endif

- #ifdef CONFIG_PHYS_64BIT #define CONFIG_SYS_FLASH_BASE_PHYS (0xf00000000ull | CONFIG_SYS_FLASH_BASE) #else @@ -581,7 +579,6 @@ #define CONFIG_SYS_BR3_PRELIM CONFIG_CPLD_BR_PRELIM /* CPLD Base Address */ #define CONFIG_SYS_OR3_PRELIM CONFIG_CPLD_OR_PRELIM /* CPLD Options */

- /* Vsc7385 switch */ #ifdef CONFIG_VSC7385_ENET #define CONFIG_SYS_VSC7385_BASE 0xffb00000 diff --git a/include/configs/pb1x00.h b/include/configs/pb1x00.h index f094850..b1fd2b8 100644 --- a/include/configs/pb1x00.h +++ b/include/configs/pb1x00.h @@ -108,10 +108,8 @@

#define CONFIG_NR_DRAM_BANKS 2

- #define CONFIG_MEMSIZE_IN_BYTES

- /*---USB -------------------------------------------*/ #if 0 #define CONFIG_USB_OHCI @@ -159,7 +157,6 @@ #define CONFIG_SYS_ICACHE_SIZE 16384 #define CONFIG_SYS_CACHELINE_SIZE 32

- /* * BOOTP options */ @@ -168,7 +165,6 @@ #define CONFIG_BOOTP_GATEWAY #define CONFIG_BOOTP_HOSTNAME

- /* * Command line configuration. */ diff --git a/include/configs/pcm030.h b/include/configs/pcm030.h index 3a9b8f3..f503520 100644 --- a/include/configs/pcm030.h +++ b/include/configs/pcm030.h @@ -76,7 +76,6 @@ Autobooting /* even with bootdelay=0 */ #undef CONFIG_BOOTARGS

- #define CONFIG_PREBOOT "echo;" \ "echo Type "run bootcmd_net" to load Kernel over TFTP and to "\ "mount root filesystem over NFS;" \ diff --git a/include/configs/pengwyn.h b/include/configs/pengwyn.h index 733ff28..155f589 100644 --- a/include/configs/pengwyn.h +++ b/include/configs/pengwyn.h @@ -149,7 +149,6 @@ 174, 175, 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191, 192, 193,\ 194, 195, 196, 197, 198, 199, 200, 201, 202, 203, 204, 205, 206, 207, 208, 209}

- #define CONFIG_SYS_NAND_ECCSIZE 512 #define CONFIG_SYS_NAND_ECCBYTES 26 #define CONFIG_SYS_NAND_ECCSTEPS 8 @@ -162,8 +161,6 @@ /* #define CONFIG_SYS_NAND_U_BOOT_OFFS 0x80000 */ #define CONFIG_SYS_NAND_U_BOOT_OFFS 0x200000

- - #define CONFIG_CMD_MTDPARTS

#define CONFIG_CMD_ASKENV /* monitor functions : ask for env variable */ diff --git a/include/configs/pm9261.h b/include/configs/pm9261.h index f883ca3..dcfc774 100644 --- a/include/configs/pm9261.h +++ b/include/configs/pm9261.h @@ -20,7 +20,6 @@ #include <asm/hardware.h> /* ARM asynchronous clock */

- #define CONFIG_DISPLAY_BOARDINFO

#define MASTER_PLL_DIV 15 diff --git a/include/configs/pm9263.h b/include/configs/pm9263.h index 0fb0a36..92d080e 100644 --- a/include/configs/pm9263.h +++ b/include/configs/pm9263.h @@ -18,7 +18,6 @@ */ #include <asm/hardware.h>

- /* ARM asynchronous clock */ #define CONFIG_DISPLAY_CPUINFO #define CONFIG_DISPLAY_BOARDINFO diff --git a/include/configs/pm9g45.h b/include/configs/pm9g45.h index ba9e6d3..a6472fb 100644 --- a/include/configs/pm9g45.h +++ b/include/configs/pm9g45.h @@ -22,7 +22,6 @@ */ #include <asm/hardware.h>

- #define CONFIG_PM9G45 1 /* It's an Ronetix PM9G45 */ #define CONFIG_SYS_AT91_CPU_NAME "AT91SAM9G45"

diff --git a/include/configs/pogo_e02.h b/include/configs/pogo_e02.h index 6314365..731b9de 100644 --- a/include/configs/pogo_e02.h +++ b/include/configs/pogo_e02.h @@ -13,7 +13,6 @@ #ifndef _CONFIG_POGO_E02_H #define _CONFIG_POGO_E02_H

- /* * Machine type definition and ID */ diff --git a/include/configs/pr1.h b/include/configs/pr1.h index 1af9ef7..9b394dd 100644 --- a/include/configs/pr1.h +++ b/include/configs/pr1.h @@ -10,14 +10,12 @@

#include <asm/config-pre.h>

- /* * Processor Settings */ #define CONFIG_BFIN_CPU bf537-0.3 #define CONFIG_BFIN_BOOT_MODE BFIN_BOOT_SPI_MASTER

- /* * Clock Settings * CCLK = (CLKIN * VCO_MULT) / CCLK_DIV @@ -41,7 +39,6 @@ /* Values can range from 1-15 */ #define CONFIG_SCLK_DIV 5

- /* * Memory Settings */ @@ -58,7 +55,6 @@ #define CONFIG_SYS_MONITOR_LEN (512 * 1024) #define CONFIG_SYS_MALLOC_LEN (384 * 1024)

- /* * Network Settings */ @@ -70,13 +66,11 @@ #define CONFIG_HOSTNAME pr1 #define CONFIG_TFTP_BLOCKSIZE 4404

- /* * Flash Settings */ #define CONFIG_SYS_NO_FLASH /* We have no parallel FLASH */

- /* * SPI Settings */ @@ -84,7 +78,6 @@ #define CONFIG_ENV_SPI_MAX_HZ 30000000 #define CONFIG_SF_DEFAULT_SPEED 30000000

- /* * Env Storage Settings */ @@ -94,14 +87,12 @@ #define CONFIG_ENV_SECT_SIZE 0x10000 #define CONFIG_ENV_IS_EMBEDDED_IN_LDR

- /* * I2C Settings */ #define CONFIG_SYS_I2C #define CONFIG_SYS_I2C_ADI

- /* * NAND Settings */ diff --git a/include/configs/pxm2.h b/include/configs/pxm2.h index 145a933..7450a1a 100644 --- a/include/configs/pxm2.h +++ b/include/configs/pxm2.h @@ -40,7 +40,6 @@ #define CONFIG_SYS_I2C_SPEED 400000 #define CONFIG_SYS_I2C_EEPROM_ADDR 0x50

- #define CONFIG_SYS_U_BOOT_MAX_SIZE_SECTORS 0x300

#undef CONFIG_SPL_NET_SUPPORT @@ -51,7 +50,6 @@

#define CONFIG_FACTORYSET

- /* Watchdog */ #define CONFIG_OMAP_WATCHDOG

diff --git a/include/configs/qemu-mips64.h b/include/configs/qemu-mips64.h index 9e5cbb1..b998052 100644 --- a/include/configs/qemu-mips64.h +++ b/include/configs/qemu-mips64.h @@ -69,7 +69,6 @@

#define CONFIG_SYS_IDE_MAXDEVICE 4

- /* * Miscellaneous configurable options */ diff --git a/include/configs/r0p7734.h b/include/configs/r0p7734.h index 88fe641..f19898f 100644 --- a/include/configs/r0p7734.h +++ b/include/configs/r0p7734.h @@ -45,7 +45,6 @@ # define CONFIG_SMC911X_BASE (0x84000000) #endif

- /* I2C */ #define CONFIG_SH_SH7734_I2C 1 #define CONFIG_HARD_I2C 1 diff --git a/include/configs/rastaban.h b/include/configs/rastaban.h index d9dde9c..aa130a1 100644 --- a/include/configs/rastaban.h +++ b/include/configs/rastaban.h @@ -70,8 +70,6 @@ #define CONFIG_ENV_SIZE_REDUND 0x2000 #define CONFIG_ENV_RANGE (4 * CONFIG_SYS_ENV_SECT_SIZE)

- - #define MTDPARTS_DEFAULT MTDPARTS_DEFAULT_V3

#ifndef CONFIG_SPL_BUILD @@ -99,7 +97,6 @@ "run nand_boot_backup;" \ "reset;"

- #else #define CONFIG_BOOTDELAY 0

diff --git a/include/configs/rk3036_common.h b/include/configs/rk3036_common.h index 01c3005..a5ab569 100644 --- a/include/configs/rk3036_common.h +++ b/include/configs/rk3036_common.h @@ -70,7 +70,6 @@ #define CONFIG_SPI_FLASH_GIGADEVICE #define CONFIG_SF_DEFAULT_SPEED 20000000

- #ifndef CONFIG_SPL_BUILD #include <config_distro_defaults.h>

diff --git a/include/configs/rk3288_common.h b/include/configs/rk3288_common.h index 02cb94b..c1ea280 100644 --- a/include/configs/rk3288_common.h +++ b/include/configs/rk3288_common.h @@ -88,7 +88,6 @@ #define CONFIG_SPI #define CONFIG_SF_DEFAULT_SPEED 20000000

- #ifndef CONFIG_SPL_BUILD #include <config_distro_defaults.h>

diff --git a/include/configs/rut.h b/include/configs/rut.h index cf018e0..bf2cc2f 100644 --- a/include/configs/rut.h +++ b/include/configs/rut.h @@ -45,7 +45,6 @@

#define CONFIG_FACTORYSET

- /* Watchdog */ #define WATCHDOG_TRIGGER_GPIO 14

diff --git a/include/configs/s5pc210_universal.h b/include/configs/s5pc210_universal.h index c14a247..bdb368e 100644 --- a/include/configs/s5pc210_universal.h +++ b/include/configs/s5pc210_universal.h @@ -162,7 +162,6 @@ #define CONFIG_SOFT_I2C_GPIO_SCL EXYNOS4_GPIO_B7 #define CONFIG_SOFT_I2C_GPIO_SDA EXYNOS4_GPIO_B6

- #define CONFIG_SYS_I2C #define CONFIG_SYS_I2C_SOFT /* I2C bit-banged */ #define CONFIG_SYS_I2C_SOFT_SPEED 50000 diff --git a/include/configs/sandbox.h b/include/configs/sandbox.h index 4b8fe16..0bdb73a 100644 --- a/include/configs/sandbox.h +++ b/include/configs/sandbox.h @@ -50,7 +50,6 @@ #define CONFIG_CMD_FS_GENERIC #define CONFIG_CMD_MD5SUM

- #define CONFIG_CMD_GPT #define CONFIG_PARTITION_UUIDS #define CONFIG_AMIGA_PARTITION diff --git a/include/configs/sbc8349.h b/include/configs/sbc8349.h index 37fdeaa..fc22134 100644 --- a/include/configs/sbc8349.h +++ b/include/configs/sbc8349.h @@ -395,7 +395,6 @@ #define CONFIG_LOADS_ECHO 1 /* echo on for serial download */ #define CONFIG_SYS_LOADS_BAUD_CHANGE 1 /* allow baudrate change */

- /* * BOOTP options */ @@ -404,7 +403,6 @@ #define CONFIG_BOOTP_GATEWAY #define CONFIG_BOOTP_HOSTNAME

- /* * Command line configuration. */ @@ -522,7 +520,6 @@ HID0_ENABLE_M_BIT |\ HID0_ENABLE_ADDRESS_BROADCAST) */

- #define CONFIG_SYS_HID2 HID2_HBE

#define CONFIG_HIGH_BATS 1 /* High BATs supported */ diff --git a/include/configs/sbc8548.h b/include/configs/sbc8548.h index 7e5cdfb..19601e7 100644 --- a/include/configs/sbc8548.h +++ b/include/configs/sbc8548.h @@ -13,7 +13,6 @@ #ifndef __CONFIG_H #define __CONFIG_H

- /* * Top level Makefile configuration choices */ @@ -472,7 +471,6 @@

#endif /* CONFIG_PCI */

- #if defined(CONFIG_TSEC_ENET)

#define CONFIG_MII 1 /* MII PHY management */ @@ -522,7 +520,6 @@ #define CONFIG_BOOTP_GATEWAY #define CONFIG_BOOTP_HOSTNAME

- /* * Command line configuration. */ @@ -533,7 +530,6 @@ #define CONFIG_CMD_PCI #endif

- #undef CONFIG_WATCHDOG /* watchdog disabled */

/* @@ -613,7 +609,6 @@ "tftp $fdtaddr $fdtfile;" \ "bootm $loadaddr - $fdtaddr"

- #define CONFIG_RAMBOOTCOMMAND \ "setenv bootargs root=/dev/ram rw " \ "console=$consoledev,$baudrate $othbootargs;" \ diff --git a/include/configs/sbc8641d.h b/include/configs/sbc8641d.h index 298e3ee..f34cef5 100644 --- a/include/configs/sbc8641d.h +++ b/include/configs/sbc8641d.h @@ -20,7 +20,6 @@ #ifndef __CONFIG_H #define __CONFIG_H

- /* High Level Configuration Options */ #define CONFIG_MPC8641 1 /* MPC8641 specific */ #define CONFIG_SBC8641D 1 /* SBC8641D board specific */ @@ -67,7 +66,6 @@ #define BANK_INTERLEAVING 0x22000000 #define SUPER_BANK_INTERLEAVING 0x23000000

- #define CONFIG_ALTIVEC 1

/* @@ -173,7 +171,6 @@ #define CONFIG_SYS_DDR2_CLK_CTRL 0x03800000 #define CONFIG_SYS_DDR2_CFG_1B 0xC3008008

- #endif

/* #define CONFIG_ID_EEPROM 1 diff --git a/include/configs/secomx6quq7.h b/include/configs/secomx6quq7.h index d4bba6d..e1c0e9a 100644 --- a/include/configs/secomx6quq7.h +++ b/include/configs/secomx6quq7.h @@ -71,7 +71,6 @@ "stdout=serial\0" \ "stderr=serial\0"

- /* Print Buffer Size */ #define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + \ sizeof(CONFIG_SYS_PROMPT) + 16) diff --git a/include/configs/sh7785lcr.h b/include/configs/sh7785lcr.h index e5ba30a..1d7fced 100644 --- a/include/configs/sh7785lcr.h +++ b/include/configs/sh7785lcr.h @@ -69,7 +69,6 @@ #undef CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE #undef CONFIG_SYS_CONSOLE_ENV_OVERWRITE

- #define CONFIG_SYS_MEMTEST_START (SH7785LCR_SDRAM_BASE) #define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_MEMTEST_START + \ (SH7785LCR_SDRAM_SIZE) - \ diff --git a/include/configs/sheevaplug.h b/include/configs/sheevaplug.h index f9fb9bc..2019156 100644 --- a/include/configs/sheevaplug.h +++ b/include/configs/sheevaplug.h @@ -10,7 +10,6 @@ #ifndef _CONFIG_SHEEVAPLUG_H #define _CONFIG_SHEEVAPLUG_H

- /* * Version number information */ diff --git a/include/configs/siemens-am33x-common.h b/include/configs/siemens-am33x-common.h index b4aa283..aecd06f 100644 --- a/include/configs/siemens-am33x-common.h +++ b/include/configs/siemens-am33x-common.h @@ -42,7 +42,6 @@ #define CONFIG_CMD_ASKENV #define CONFIG_CMD_CACHE

- #define CONFIG_ENV_VARS_UBOOT_CONFIG #ifndef CONFIG_SPL_BUILD #define CONFIG_ROOTPATH "/opt/eldk" @@ -485,7 +484,6 @@ "512k(mtdoops)," \ "-(rootfs)"

- #define DFU_ALT_INFO_NAND_V2 \ "spl part 0 1;" \ "spl.backup1 part 0 2;" \ @@ -577,7 +575,6 @@ "512k(mtdoops)," \ "-(configuration)"

- #define CONFIG_NAND_OMAP_GPMC #define CONFIG_NAND_OMAP_ELM #define CONFIG_SYS_NAND_BASE (0x08000000) /* physical address */ diff --git a/include/configs/smartweb.h b/include/configs/smartweb.h index 54701f3..4daab98 100644 --- a/include/configs/smartweb.h +++ b/include/configs/smartweb.h @@ -235,7 +235,6 @@ (ATMEL_BASE_SRAM1 + 0x1000 - GENERATED_GBL_DATA_SIZE) #endif

- /* Defines for SPL */ #define CONFIG_SPL_FRAMEWORK #define CONFIG_SPL_TEXT_BASE 0x0 diff --git a/include/configs/smdk2410.h b/include/configs/smdk2410.h index 6b460bf..f009343 100644 --- a/include/configs/smdk2410.h +++ b/include/configs/smdk2410.h @@ -23,7 +23,6 @@

#define CONFIG_SYS_TEXT_BASE 0x0

- #define CONFIG_SYS_ARM_CACHE_WRITETHROUGH

/* input clock of PLL (the SMDK2410 has 12MHz input clock) */ @@ -60,7 +59,6 @@ ************************************************************/ #define CONFIG_RTC_S3C24X0

- #define CONFIG_BAUDRATE 115200

/* diff --git a/include/configs/smdkv310.h b/include/configs/smdkv310.h index 63f6204..0c21deb 100644 --- a/include/configs/smdkv310.h +++ b/include/configs/smdkv310.h @@ -41,7 +41,6 @@ /* allow to overwrite serial and ethaddr */ #define CONFIG_ENV_OVERWRITE

- /* MMC SPL */ #define CONFIG_SKIP_LOWLEVEL_INIT #define COPY_BL2_FNPTR_ADDR 0x00002488 diff --git a/include/configs/sniper.h b/include/configs/sniper.h index 3fbc2be..eb53a21 100644 --- a/include/configs/sniper.h +++ b/include/configs/sniper.h @@ -88,7 +88,6 @@ #define CONFIG_SYS_I2C_OMAP34XX #define CONFIG_I2C_MULTI_BUS

- /* * Flash */ diff --git a/include/configs/socfpga_common.h b/include/configs/socfpga_common.h index 9b2313c..4fdc09a 100644 --- a/include/configs/socfpga_common.h +++ b/include/configs/socfpga_common.h @@ -6,7 +6,6 @@ #ifndef __CONFIG_SOCFPGA_COMMON_H__ #define __CONFIG_SOCFPGA_COMMON_H__

- /* Virtual target or real hardware */ #undef CONFIG_SOCFPGA_VIRTUAL_TARGET

diff --git a/include/configs/socrates.h b/include/configs/socrates.h index f45d91f..cf1e904 100644 --- a/include/configs/socrates.h +++ b/include/configs/socrates.h @@ -208,7 +208,6 @@ #define CONFIG_CMDLINE_EDITING 1 /* add command line history */ #define CONFIG_AUTO_COMPLETE 1 /* add autocompletion support */

- /* * I2C */ @@ -257,7 +256,6 @@ #undef CONFIG_PCI_SCAN_SHOW /* show pci devices on startup */ #endif /* CONFIG_PCI */

- #define CONFIG_MII 1 /* MII PHY management */ #define CONFIG_TSEC1 1 #define CONFIG_TSEC1_NAME "TSEC0" @@ -295,7 +293,6 @@

#define CONFIG_TIMESTAMP /* Print image info with ts */

- /* * BOOTP options */ @@ -304,7 +301,6 @@ #define CONFIG_BOOTP_GATEWAY #define CONFIG_BOOTP_HOSTNAME

- /* * Command line configuration. */ @@ -350,7 +346,6 @@ #define CONFIG_KGDB_BAUDRATE 230400 /* speed to run kgdb serial port*/ #endif

- #define CONFIG_LOADADDR 200000 /* default addr for tftp & bootm*/

#define CONFIG_BOOTDELAY 1 /* -1 disables auto-boot */ diff --git a/include/configs/spear-common.h b/include/configs/spear-common.h index 63a5b70..269ce7e 100644 --- a/include/configs/spear-common.h +++ b/include/configs/spear-common.h @@ -11,7 +11,6 @@ * Common configurations used for both spear3xx as well as spear6xx */

- /* U-Boot Load Address */ #define CONFIG_SYS_TEXT_BASE 0x00700000

@@ -176,7 +175,6 @@ "console=ttyAMA0,115200 $(othbootargs);" \ CONFIG_BOOTCOMMAND

- #define CONFIG_ENV_SIZE 0x02000 #define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE

diff --git a/include/configs/strider.h b/include/configs/strider.h index 2c1d4fb..a5b2223 100644 --- a/include/configs/strider.h +++ b/include/configs/strider.h @@ -637,5 +637,4 @@ int fpga_gpio_get(unsigned int bus, int pin);

#define CONFIG_BOOTCOMMAND CONFIG_MMCBOOTCOMMAND

- #endif /* __CONFIG_H */ diff --git a/include/configs/sun8i.h b/include/configs/sun8i.h index bf1b740..b9a8731 100644 --- a/include/configs/sun8i.h +++ b/include/configs/sun8i.h @@ -26,7 +26,6 @@ #define CONFIG_SUNXI_USB_PHYS 2 #endif

- #ifndef CONFIG_MACH_SUN8I_A83T #define CONFIG_ARMV7_PSCI 1 #if defined(CONFIG_MACH_SUN8I_A23) diff --git a/include/configs/t3corp.h b/include/configs/t3corp.h index 1ac54e2..64e200e 100644 --- a/include/configs/t3corp.h +++ b/include/configs/t3corp.h @@ -372,7 +372,6 @@ #define CONFIG_SYS_PCI_SUBSYS_VENDORID 0x1014 /* IBM */ #define CONFIG_SYS_PCI_SUBSYS_DEVICEID 0xcafe /* Whatever */

- /* * External Bus Controller (EBC) Setup */ diff --git a/include/configs/t4qds.h b/include/configs/t4qds.h index be68fac..f77e63c 100644 --- a/include/configs/t4qds.h +++ b/include/configs/t4qds.h @@ -98,14 +98,12 @@ #define CONFIG_DDR_SPD #define CONFIG_SYS_FSL_DDR3

- /* * IFC Definitions */ #define CONFIG_SYS_FLASH_BASE 0xe0000000 #define CONFIG_SYS_FLASH_BASE_PHYS (0xf00000000ull | CONFIG_SYS_FLASH_BASE)

- #ifdef CONFIG_SPL_BUILD #define CONFIG_SYS_MONITOR_BASE CONFIG_SPL_TEXT_BASE #else @@ -304,7 +302,6 @@ /* default location for tftp and bootm */ #define CONFIG_LOADADDR 1000000

- #define CONFIG_BAUDRATE 115200

#define CONFIG_HVBOOT \ diff --git a/include/configs/tam3517-common.h b/include/configs/tam3517-common.h index b270d9d..ef9e22e 100644 --- a/include/configs/tam3517-common.h +++ b/include/configs/tam3517-common.h @@ -316,7 +316,6 @@ "fi;" \ "else echo U-Boot not downloaded..exiting;fi\0" \

- /* * this is common code for all TAM3517 boards. * MAC address is stored from manufacturer in diff --git a/include/configs/taurus.h b/include/configs/taurus.h index d389752..946bfd4 100644 --- a/include/configs/taurus.h +++ b/include/configs/taurus.h @@ -22,7 +22,6 @@ #include <asm/hardware.h> #include <linux/sizes.h>

- #if defined(CONFIG_SPL_BUILD) #define CONFIG_SYS_THUMB_BUILD #define CONFIG_SYS_ICACHE_OFF @@ -35,7 +34,6 @@ * hex number here! */

- #define CONFIG_SYS_TEXT_BASE 0x21000000

/* ARM asynchronous clock */ @@ -299,7 +297,6 @@ 48, 49, 50, 51, 52, 53, 54, 55, \ 56, 57, 58, 59, 60, 61, 62, 63, }

- #define CONFIG_SPL_ATMEL_SIZE #define CONFIG_SYS_MASTER_CLOCK 132096000 #define AT91_PLL_LOCK_TIMEOUT 1000000 diff --git a/include/configs/tcm-bf518.h b/include/configs/tcm-bf518.h index 0f4d959..e017ba9 100644 --- a/include/configs/tcm-bf518.h +++ b/include/configs/tcm-bf518.h @@ -7,14 +7,12 @@

#include <asm/config-pre.h>

- /* * Processor Settings */ #define CONFIG_BFIN_CPU bf518-0.0 #define CONFIG_BFIN_BOOT_MODE BFIN_BOOT_PARA

- /* * Clock Settings * CCLK = (CLKIN * VCO_MULT) / CCLK_DIV @@ -38,7 +36,6 @@ /* Values can range from 1-15 */ #define CONFIG_SCLK_DIV 4

- /* * Memory Settings */ @@ -56,7 +53,6 @@ #define CONFIG_SYS_MONITOR_LEN (512 * 1024) #define CONFIG_SYS_MALLOC_LEN (384 * 1024)

- /* * Network Settings */ @@ -77,7 +73,6 @@ #define CONFIG_SYS_MAX_FLASH_BANKS 1 #define CONFIG_SYS_MAX_FLASH_SECT 19

- /* * SPI Settings */ @@ -85,7 +80,6 @@ #define CONFIG_ENV_SPI_MAX_HZ 30000000 #define CONFIG_SF_DEFAULT_SPEED 30000000

- /* * Env Storage Settings */ @@ -96,14 +90,12 @@ #define CONFIG_ENV_SECT_SIZE 0x8000 #define CONFIG_ENV_IS_EMBEDDED_IN_LDR

- /* * I2C Settings */ #define CONFIG_SYS_I2C #define CONFIG_SYS_I2C_ADI

- /* * Misc Settings */ diff --git a/include/configs/tcm-bf537.h b/include/configs/tcm-bf537.h index fc98d24..c294f70 100644 --- a/include/configs/tcm-bf537.h +++ b/include/configs/tcm-bf537.h @@ -7,14 +7,12 @@

#include <asm/config-pre.h>

- /* * Processor Settings */ #define CONFIG_BFIN_CPU bf537-0.2 #define CONFIG_BFIN_BOOT_MODE BFIN_BOOT_BYPASS

- /* * Clock Settings * CCLK = (CLKIN * VCO_MULT) / CCLK_DIV @@ -41,7 +39,6 @@ /* Decrease core voltage */ #define CONFIG_VR_CTL_VAL (VLEV_115 | CLKBUFOE | GAIN_20 | FREQ_1000)

- /* * Memory Settings */ @@ -58,7 +55,6 @@ #define CONFIG_SYS_MONITOR_LEN (768 * 1024) #define CONFIG_SYS_MALLOC_LEN (128 * 1024)

- /* * Network Settings */ @@ -83,14 +79,12 @@ #define CONFIG_SYS_MAX_FLASH_BANKS 1 #define CONFIG_SYS_MAX_FLASH_SECT 67

- /* * SPI Settings */ #define CONFIG_BFIN_SPI #define CONFIG_ENV_SPI_MAX_HZ 30000000

- /* * Env Storage Settings */ @@ -115,14 +109,12 @@ common/env_embedded.o (.text*); #endif

- /* * I2C Settings */ #define CONFIG_SYS_I2C #define CONFIG_SYS_I2C_ADI

- /* * SPI_MMC Settings */ @@ -148,5 +140,4 @@ */ #include <configs/bfin_adi_common.h>

- #endif diff --git a/include/configs/theadorable.h b/include/configs/theadorable.h index 4183867..a5a7fae 100644 --- a/include/configs/theadorable.h +++ b/include/configs/theadorable.h @@ -73,7 +73,6 @@ #define CONFIG_SYS_ALT_MEMTEST #define CONFIG_PREBOOT

- /* Keep device tree and initrd in lower memory so the kernel can access them */ #define CONFIG_EXTRA_ENV_SETTINGS \ "fdt_high=0x10000000\0" \ diff --git a/include/configs/thuban.h b/include/configs/thuban.h index 4024468..077422f 100644 --- a/include/configs/thuban.h +++ b/include/configs/thuban.h @@ -63,7 +63,6 @@ #define CONFIG_ENV_SIZE_REDUND 0x2000 #define CONFIG_ENV_RANGE (4 * CONFIG_SYS_ENV_SECT_SIZE)

- #define MTDPARTS_DEFAULT MTDPARTS_DEFAULT_V2

#ifndef CONFIG_SPL_BUILD @@ -91,7 +90,6 @@ "run nand_boot_backup;" \ "reset;"

- #else #define CONFIG_BOOTDELAY 0

diff --git a/include/configs/thunderx_88xx.h b/include/configs/thunderx_88xx.h index fc16678..7c35d8c 100644 --- a/include/configs/thunderx_88xx.h +++ b/include/configs/thunderx_88xx.h @@ -15,7 +15,6 @@

#define CONFIG_SYS_NO_FLASH

- #define CONFIG_IDENT_STRING \ " for Cavium Thunder CN88XX ARM v8 Multi-Core" #define CONFIG_BOOTP_VCI_STRING "Diagnostics" @@ -31,11 +30,9 @@ /* SMP Spin Table Definitions */ #define CPU_RELEASE_ADDR (CONFIG_SYS_SDRAM_BASE + 0x7fff0)

- /* Generic Timer Definitions */ #define COUNTER_FREQUENCY (0x1800000) /* 24MHz */

- #define CONFIG_SYS_MEMTEST_START MEM_BASE #define CONFIG_SYS_MEMTEST_END (MEM_BASE + PHYS_SDRAM_1_SIZE)

diff --git a/include/configs/ti816x_evm.h b/include/configs/ti816x_evm.h index b5216a8..83b745a 100644 --- a/include/configs/ti816x_evm.h +++ b/include/configs/ti816x_evm.h @@ -84,7 +84,6 @@ #define CONFIG_TI816X_USE_EMIF0 1 #define CONFIG_TI816X_USE_EMIF1 1

- #define CONFIG_NR_DRAM_BANKS 2 /* we have 2 banks of DRAM */ #define PHYS_DRAM_1 0x80000000 /* DRAM Bank #1 */ #define PHYS_DRAM_1_SIZE 0x40000000 /* 1 GB */ diff --git a/include/configs/ti_omap3_common.h b/include/configs/ti_omap3_common.h index 6a4868c..32877d1 100644 --- a/include/configs/ti_omap3_common.h +++ b/include/configs/ti_omap3_common.h @@ -76,7 +76,6 @@ #define CONFIG_SYS_SPL_ARGS_ADDR (CONFIG_SYS_SDRAM_BASE + \ (64 << 20))

- #ifdef CONFIG_NAND #define CONFIG_SPL_NAND_SIMPLE #define CONFIG_SYS_NAND_BASE 0x30000000 diff --git a/include/configs/ti_omap5_common.h b/include/configs/ti_omap5_common.h index 202b18c..b049be4 100644 --- a/include/configs/ti_omap5_common.h +++ b/include/configs/ti_omap5_common.h @@ -112,7 +112,6 @@ DFUARGS \ NETARGS \

- #define CONFIG_BOOTCOMMAND \ "if test ${dofastboot} -eq 1; then " \ "echo Boot fastboot requested, resetting dofastboot ...;" \ @@ -129,7 +128,6 @@ "" #endif

- /* * SPL related defines. The Public RAM memory map the ROM defines the * area between 0x40300000 and 0x4031E000 as a download area for OMAP5 diff --git a/include/configs/tqma6.h b/include/configs/tqma6.h index 2e729d2..439a4fd 100644 --- a/include/configs/tqma6.h +++ b/include/configs/tqma6.h @@ -281,7 +281,6 @@ "sf read ${${fdt_addr}} ${offset} ${size}; " \ "setenv size ; setenv offset\0" \

- #define CONFIG_BOOTCOMMAND \ "sf probe; run mmcboot; run netboot; run panicboot" \

diff --git a/include/configs/tqma6_wru4.h b/include/configs/tqma6_wru4.h index c67e0bd..8896bc3 100644 --- a/include/configs/tqma6_wru4.h +++ b/include/configs/tqma6_wru4.h @@ -38,7 +38,6 @@ #define CONFIG_SYS_RTC_DS1337_NOOSC #define CONFIG_CMD_DATE

- /* LED */ #define CONFIG_CMD_LED #define CONFIG_STATUS_LED diff --git a/include/configs/trats.h b/include/configs/trats.h index 2c0e5ed..0c875cb 100644 --- a/include/configs/trats.h +++ b/include/configs/trats.h @@ -14,7 +14,6 @@

#define CONFIG_TRATS

- #define CONFIG_TIZEN /* TIZEN lib */

#define CONFIG_SYS_L2CACHE_OFF @@ -184,7 +183,6 @@ /* I2C */ #include <asm/arch/gpio.h>

- #define CONFIG_SYS_I2C #define CONFIG_SYS_I2C_S3C24X0 #define CONFIG_SYS_I2C_S3C24X0_SPEED 100000 diff --git a/include/configs/trats2.h b/include/configs/trats2.h index bad360e..492a253 100644 --- a/include/configs/trats2.h +++ b/include/configs/trats2.h @@ -160,7 +160,6 @@ /* I2C */ #include <asm/arch/gpio.h>

- #define CONFIG_SYS_I2C #define CONFIG_SYS_I2C_S3C24X0 #define CONFIG_SYS_I2C_S3C24X0_SPEED 100000 diff --git a/include/configs/tricorder.h b/include/configs/tricorder.h index 41cc9fa..2514e88 100644 --- a/include/configs/tricorder.h +++ b/include/configs/tricorder.h @@ -41,7 +41,6 @@ #include <asm/arch/cpu.h> /* get chip and board defs */ #include <asm/arch/omap.h>

- /* Display CPU and Board information */ #define CONFIG_DISPLAY_CPUINFO #define CONFIG_DISPLAY_BOARDINFO diff --git a/include/configs/uniphier.h b/include/configs/uniphier.h index c6fc90f..1d740d0 100644 --- a/include/configs/uniphier.h +++ b/include/configs/uniphier.h @@ -71,7 +71,6 @@ /* serial console configuration */ #define CONFIG_BAUDRATE 115200

- #if !defined(CONFIG_SPL_BUILD) #define CONFIG_USE_ARCH_MEMSET #define CONFIG_USE_ARCH_MEMCPY diff --git a/include/configs/v38b.h b/include/configs/v38b.h index 870e5a8..c8cc842 100644 --- a/include/configs/v38b.h +++ b/include/configs/v38b.h @@ -73,7 +73,6 @@ #define CONFIG_USB_CLOCK 0x0001BBBB #define CONFIG_USB_CONFIG 0x00001000

- /* * BOOTP options */ @@ -82,7 +81,6 @@ #define CONFIG_BOOTP_GATEWAY #define CONFIG_BOOTP_HOSTNAME

- /* * Command line configuration. */ @@ -96,7 +94,6 @@ #define CONFIG_CMD_DATE #define CONFIG_CMD_FAT

- #define CONFIG_TIMESTAMP /* Print image info with timestamp */

/* diff --git a/include/configs/ve8313.h b/include/configs/ve8313.h index face83f..59bf2b3 100644 --- a/include/configs/ve8313.h +++ b/include/configs/ve8313.h @@ -280,7 +280,6 @@ */ #define CONFIG_TSEC_ENET /* TSEC ethernet support */

- #define CONFIG_TSEC1 #ifdef CONFIG_TSEC1 #define CONFIG_HAS_ETH0 diff --git a/include/configs/vexpress_aemv8a.h b/include/configs/vexpress_aemv8a.h index e924963..a7e1195 100644 --- a/include/configs/vexpress_aemv8a.h +++ b/include/configs/vexpress_aemv8a.h @@ -307,5 +307,4 @@ #define CONFIG_ENV_SIZE CONFIG_ENV_SECT_SIZE #define CONFIG_ENV_IS_IN_FLASH 1

- #endif /* __VEXPRESS_AEMV8A_H */ diff --git a/include/configs/vinco.h b/include/configs/vinco.h index 353b17b..b0737e7 100644 --- a/include/configs/vinco.h +++ b/include/configs/vinco.h @@ -34,7 +34,6 @@ #define CONFIG_SYS_SDRAM_BASE ATMEL_BASE_DDRCS #define CONFIG_SYS_SDRAM_SIZE 0x4000000

- #define CONFIG_SYS_INIT_SP_ADDR \ (CONFIG_SYS_SDRAM_BASE + 4 * 1024 - GENERATED_GBL_DATA_SIZE)

@@ -54,7 +53,6 @@ #define CONFIG_ENV_SPI_MODE (SPI_MODE_0) #endif

- /* MMC */ #define CONFIG_CMD_MMC

@@ -101,12 +99,10 @@ #define CONFIG_NET_RETRY_COUNT 20 #define CONFIG_MACB_SEARCH_PHY

- #define CONFIG_USB_HOST_ETHER #define CONFIG_USB_ETHER_SMSC95XX #define CONFIG_USB_ETHER_RNDIS

- #ifdef CONFIG_SYS_USE_SERIALFLASH /* bootstrap + u-boot + env + linux in serial flash */ #define CONFIG_ENV_SPI_BUS CONFIG_SF_DEFAULT_BUS diff --git a/include/configs/warp7.h b/include/configs/warp7.h index 0afa75f..8c72178 100644 --- a/include/configs/warp7.h +++ b/include/configs/warp7.h @@ -16,7 +16,6 @@

#define CONFIG_MXC_UART_BASE UART1_IPS_BASE_ADDR

- /* Size of malloc() pool */ #define CONFIG_SYS_MALLOC_LEN (32 * SZ_1M)

diff --git a/include/configs/woodburn_common.h b/include/configs/woodburn_common.h index 631f273..af6cbe4 100644 --- a/include/configs/woodburn_common.h +++ b/include/configs/woodburn_common.h @@ -62,7 +62,6 @@ #define CONFIG_SYS_FSL_PMIC_I2C_ADDR 0x8 #define CONFIG_RTC_MC13XXX

- /* mmc driver */ #define CONFIG_MMC #define CONFIG_GENERIC_MMC @@ -108,7 +107,6 @@

#define CONFIG_LOADADDR 0x80800000 /* loadaddr env var */

- /* * Ethernet on SOC (FEC) */ diff --git a/include/configs/work_92105.h b/include/configs/work_92105.h index 5d8ac41..c59688c 100644 --- a/include/configs/work_92105.h +++ b/include/configs/work_92105.h @@ -107,7 +107,6 @@ #define CONFIG_SYS_MAXARGS 16 #define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE

- #define CONFIG_AUTO_COMPLETE #define CONFIG_CMDLINE_EDITING #define CONFIG_VERSION_VARIABLE diff --git a/include/configs/x600.h b/include/configs/x600.h index 1cdb10d..265d710 100644 --- a/include/configs/x600.h +++ b/include/configs/x600.h @@ -129,7 +129,6 @@

#define CONFIG_BOOTDELAY 3

- /* * U-Boot Environment placing definitions. */ diff --git a/include/configs/x86-common.h b/include/configs/x86-common.h index 7cca864..c72ae72 100644 --- a/include/configs/x86-common.h +++ b/include/configs/x86-common.h @@ -194,7 +194,6 @@ #define CONFIG_BOOTP_GATEWAY #define CONFIG_BOOTP_HOSTNAME

- /* Default environment */ #define CONFIG_ROOTPATH "/opt/nfsroot" #define CONFIG_HOSTNAME x86 diff --git a/include/configs/xilinx-ppc.h b/include/configs/xilinx-ppc.h index ec26dc1..3ab8eab 100644 --- a/include/configs/xilinx-ppc.h +++ b/include/configs/xilinx-ppc.h @@ -12,7 +12,6 @@ #ifndef __CONFIG_XLX_H #define __CONFIG_XLX_H

- /* #define DEBUG #define ET_DEBUG diff --git a/include/configs/xpedite550x.h b/include/configs/xpedite550x.h index a84099a..3aa21eb 100644 --- a/include/configs/xpedite550x.h +++ b/include/configs/xpedite550x.h @@ -299,7 +299,6 @@ extern unsigned long get_board_ddr_clk(unsigned long dummy); #define CONFIG_SYS_PCIE1_IO_PHYS 0xe8000000 #define CONFIG_SYS_PCIE1_IO_SIZE 0x00800000 /* 8M */

- /* * Networking options */ diff --git a/include/configs/zmx25.h b/include/configs/zmx25.h index e66a7f4..72c6c0a 100644 --- a/include/configs/zmx25.h +++ b/include/configs/zmx25.h @@ -15,7 +15,6 @@ #define CONFIG_MX25 #define CONFIG_SYS_TEXT_BASE 0xA0000000

- #define CONFIG_SYS_TIMER_RATE 32768 #define CONFIG_SYS_TIMER_COUNTER \ (&((struct gpt_regs *)IMX_GPT1_BASE)->counter) @@ -83,7 +82,6 @@ */ #define CONFIG_CMD_FAT

- /* * USB */ diff --git a/include/configs/zynq-common.h b/include/configs/zynq-common.h index 39665ee..4f49ba8 100644 --- a/include/configs/zynq-common.h +++ b/include/configs/zynq-common.h @@ -389,5 +389,4 @@

#define CONFIG_SYS_UBOOT_START CONFIG_SYS_TEXT_BASE

- #endif /* __CONFIG_ZYNQ_COMMON_H */