Merge branch 'master' of /home/wd/git/u-boot/custodians

diff --git a/boards.cfg b/boards.cfg
index 15486de803f1c112efce750cb433fdd68e6de499..87003bd3a1be9721a073c07044e3f99fde216a10 100644 (file)
--- a/boards.cfg
+++ b/boards.cfg
@@ -328,16 +328,16 @@ mcu25             powerpc ppc4xx          mcu25           netstal
 alpr           powerpc ppc4xx          -               prodrive
 p3p440         powerpc ppc4xx          -               prodrive
 KAREF          powerpc ppc4xx          karef           sandburst
-acadia_nand            powerpc ppc4xx  acadia          amcc            -       acadia:NAND_U_BOOT=y,SYS_TEXT_BASE=0x01000000
-bamboo_nand            powerpc ppc4xx  bamboo          amcc            -       bamboo:NAND_U_BOOT=y,SYS_TEXT_BASE=0x01000000
-haleakala_nand         powerpc ppc4xx  kilauea         amcc            -       kilauea:NAND_U_BOOT=y,SYS_TEXT_BASE=0x01000000
+acadia_nand            powerpc ppc4xx  acadia          amcc            -       acadia:NAND_U_BOOT,SYS_TEXT_BASE=0x01000000
+bamboo_nand            powerpc ppc4xx  bamboo          amcc            -       bamboo:NAND_U_BOOT,SYS_TEXT_BASE=0x01000000
+haleakala_nand         powerpc ppc4xx  kilauea         amcc            -       kilauea:NAND_U_BOOT,SYS_TEXT_BASE=0x01000000
 kilauea                powerpc ppc4xx          kilauea         amcc            -       kilauea:KILAUEA
-kilauea_nand           powerpc ppc4xx  kilauea         amcc            -       kilauea:NAND_U_BOOT=y,SYS_TEXT_BASE=0x01000000
+kilauea_nand           powerpc ppc4xx  kilauea         amcc            -       kilauea:NAND_U_BOOT,SYS_TEXT_BASE=0x01000000
 rainier                powerpc ppc4xx          sequoia         amcc            -       sequoia:RAINIER
-rainier_nand           powerpc ppc4xx  sequoia         amcc            -       sequoia:RAINIER,NAND_U_BOOT=y,SYS_TEXT_BASE=0x01000000
+rainier_nand           powerpc ppc4xx  sequoia         amcc            -       sequoia:RAINIER,NAND_U_BOOT,SYS_TEXT_BASE=0x01000000
 rainier_ramboot                powerpc ppc4xx  sequoia         amcc            -       sequoia:RAINIER,SYS_RAMBOOT,SYS_TEXT_BASE=0x01000000,SYS_LDSCRIPT=board/amcc/sequoia/u-boot-ram.lds
 sequoia                powerpc ppc4xx          sequoia         amcc            -       sequoia:SEQUOIA
-sequoia_nand           powerpc ppc4xx  sequoia         amcc            -       sequoia:SEQUOIA,NAND_U_BOOT=y,SYS_TEXT_BASE=0x01000000
+sequoia_nand           powerpc ppc4xx  sequoia         amcc            -       sequoia:SEQUOIA,NAND_U_BOOT,SYS_TEXT_BASE=0x01000000
 sequoia_ramboot                powerpc ppc4xx  sequoia         amcc            -       sequoia:SEQUOIA,SYS_RAMBOOT,SYS_TEXT_BASE=0x01000000,SYS_LDSCRIPT=board/amcc/sequoia/u-boot-ram.lds
 fx12mm         powerpc ppc4xx          fx12mm          avnet           -       fx12mm:SYS_TEXT_BASE=0x03000000,SYS_LDSCRIPT=$(SRCTREE)/board/xilinx/ppc405-generic/u-boot-ram.lds
 fx12mm_flash           powerpc ppc4xx  fx12mm          avnet           -       fx12mm:SYS_TEXT_BASE=0xFFCB0000,SYS_LDSCRIPT=$(SRCTREE)/board/xilinx/ppc405-generic/u-boot-rom.lds
@@ -347,7 +347,7 @@ ml507               powerpc ppc4xx          ml507           xilinx          -       ml507:SYS_TEXT_BASE=0x04000000,SYS_LDSCR
 ml507_flash            powerpc ppc4xx  ml507           xilinx          -       ml507:SYS_TEXT_BASE=0xFE360000,SYS_LDSCRIPT=$(SRCTREE)/board/xilinx/ppc440-generic/u-boot-rom.lds
 arches         powerpc ppc4xx          canyonlands     amcc            -       canyonlands:ARCHES
 glacier                powerpc ppc4xx          canyonlands     amcc            -       canyonlands:GLACIER
-glacier_nand           powerpc ppc4xx  canyonlands     amcc            -       canyonlands:GLACIER,NAND_U_BOOT=y,SYS_TEXT_BASE=0x01000000
+glacier_nand           powerpc ppc4xx  canyonlands     amcc            -       canyonlands:GLACIER,NAND_U_BOOT,SYS_TEXT_BASE=0x01000000
 v5fx30teval            powerpc ppc4xx  v5fx30teval     avnet           -       v5fx30teval:SYS_TEXT_BASE=0x03000000,SYS_LDSCRIPT=$(SRCTREE)/board/xilinx/ppc440-generic/u-boot-ram.lds
 grsim          sparc   leon3           -               gaisler
 PM825_ROMBOOT_BIGFLASH   powerpc  mpc8260  pm826       -               -       PM826:PCI,BOOT_ROM,FLASH_32MB,SYS_TEXT_BASE=0xFF800000
@@ -691,8 +691,8 @@ PQ2FADS-VR_lowboot  powerpc  mpc8260        mpc8260ads      freescale       -       MPC8260ADS:ADSTYPE=C
 PQ2FADS-ZU_66MHz  powerpc  mpc8260     mpc8260ads      freescale       -       MPC8260ADS:ADSTYPE=CONFIG_SYS_PQ2FADS,8260_CLKIN=66000000
 PQ2FADS-ZU_66MHz_lowboot  powerpc  mpc8260  mpc8260ads freescale       -       MPC8260ADS:ADSTYPE=CONFIG_SYS_PQ2FADS,8260_CLKIN=66000000,SYS_TEXT_BASE=0xFF800000
 PQ2FADS-ZU_lowboot  powerpc  mpc8260   mpc8260ads      freescale       -       MPC8260ADS:ADSTYPE=CONFIG_SYS_PQ2FADS,SYS_TEXT_BASE=0xFF800000
-MPC8313ERDB_NAND_33  powerpc  mpc83xx  mpc8313erdb     freescale       -       MPC8313ERDB:SYS_33MHZ,NAND_U_BOOT=y,SYS_TEXT_BASE=0x00100000
-MPC8313ERDB_NAND_66  powerpc  mpc83xx  mpc8313erdb     freescale       -       MPC8313ERDB:SYS_66MHZ,NAND_U_BOOT=y,SYS_TEXT_BASE=0x00100000
+MPC8313ERDB_NAND_33  powerpc  mpc83xx  mpc8313erdb     freescale       -       MPC8313ERDB:SYS_33MHZ,NAND_U_BOOT,SYS_TEXT_BASE=0x00100000
+MPC8313ERDB_NAND_66  powerpc  mpc83xx  mpc8313erdb     freescale       -       MPC8313ERDB:SYS_66MHZ,NAND_U_BOOT,SYS_TEXT_BASE=0x00100000
 MPC8315ERDB_NAND  powerpc  mpc83xx     mpc8315erdb     freescale       -       MPC8315ERDB:NAND
 MPC832XEMDS_HOST_33  powerpc  mpc83xx  mpc832xemds     freescale       -       MPC832XEMDS:PCI,PCI_33M,PQ_MDS_PIB=1
 MPC832XEMDS_HOST_66  powerpc  mpc83xx  mpc832xemds     freescale       -       MPC832XEMDS:PCI,PCI_66M,PQ_MDS_PIB=1
@@ -717,7 +717,7 @@ MPC8641HPCN_36BIT  powerpc  mpc86xx mpc8641hpcn     freescale       -       MPC8641HPCN:PHYS_64B
 NETTA_6412_SWAPHOOK  powerpc  mpc8xx   netta           -               -       NETTA:NETTA_6412=1,NETTA_SWAPHOOK=1
 NETTA_ISDN_SWAPHOOK  powerpc  mpc8xx   netta           -               -       NETTA:NETTA_ISDN=1,NETTA_SWAPHOOK=1
 NETTA_ISDN_6412_SWAPHOOK  powerpc  mpc8xx  netta       -               -       NETTA:NETTA_ISDN=1,NETTA_6412=1,NETTA_SWAPHOOK=1
-canyonlands_nand  powerpc  ppc4xx      canyonlands     amcc            -       canyonlands:CANYONLANDS,NAND_U_BOOT=y,SYS_TEXT_BASE=0x01000000
+canyonlands_nand  powerpc  ppc4xx      canyonlands     amcc            -       canyonlands:CANYONLANDS,NAND_U_BOOT,SYS_TEXT_BASE=0x01000000
 v5fx30teval_flash  powerpc  ppc4xx     v5fx30teval     avnet           -       v5fx30teval:SYS_TEXT_BASE=0xFF1C0000,SYS_LDSCRIPT=$(SRCTREE)/board/xilinx/ppc440-generic/u-boot-rom.lds
 PPChameleonEVB_BA_25  powerpc  ppc4xx  PPChameleonEVB  dave            -       PPChameleonEVB:PPCHAMELEON_MODULE_MODEL=0,PPCHAMELEON_CLK_25
 PPChameleonEVB_BA_33  powerpc  ppc4xx  PPChameleonEVB  dave            -       PPChameleonEVB:PPCHAMELEON_MODULE_MODEL=0,PPCHAMELEON_CLK_33