CHANGELOG | 813 +++++ MAINTAINERS | 2 +- Makefile | 11 +- README | 93 +- README.imx31 | 13 + api/api.c | 2 +- board/BuS/EB+MCF-EV123/u-boot.lds | 2 +- board/LEOX/elpt860/README.LEOX | 2 +- board/LEOX/elpt860/flash.c | 10 +- board/LEOX/elpt860/u-boot.lds | 2 +- board/LEOX/elpt860/u-boot.lds.debug | 2 +- board/MAI/AmigaOneG3SE/flash_new.c | 6 +- board/MAI/AmigaOneG3SE/u-boot.lds | 2 +- board/Marvell/common/bootseq.txt | 2 +- board/Marvell/db64360/u-boot.lds | 2 +- board/Marvell/db64460/u-boot.lds | 2 +- board/MigoR/u-boot.lds | 4 +- board/RPXClassic/u-boot.lds | 2 +- board/RPXClassic/u-boot.lds.debug | 2 +- board/RPXlite/u-boot.lds | 2 +- board/RPXlite/u-boot.lds.debug | 2 +- board/RPXlite_dw/README | 2 +- board/RPXlite_dw/u-boot.lds | 2 +- board/RPXlite_dw/u-boot.lds.debug | 2 +- board/RRvision/flash.c | 10 +- board/RRvision/u-boot.lds | 2 +- board/a3000/a3000.c | 1 - board/a3000/flash.c | 22 +- board/actux1/u-boot.lds | 2 +- board/actux2/u-boot.lds | 2 +- board/actux3/u-boot.lds | 2 +- board/alaska/flash.c | 8 +- board/amcc/acadia/u-boot-nand.lds | 2 +- board/amcc/bamboo/flash.c | 12 +- board/amcc/bamboo/u-boot-nand.lds | 2 +- board/amcc/bubinga/flash.c | 10 +- board/amcc/canyonlands/canyonlands.c | 16 +- board/amcc/canyonlands/u-boot-nand.lds | 2 +- board/amcc/ebony/flash.c | 10 +- board/amcc/kilauea/kilauea.c | 2 +- board/amcc/kilauea/u-boot-nand.lds | 2 +- board/amcc/luan/flash.c | 10 +- board/amcc/makalu/makalu.c | 2 +- board/amcc/ocotea/flash.c | 10 +- board/amcc/redwood/u-boot.lds | 2 +- board/amcc/sequoia/sequoia.c | 6 +- board/amcc/sequoia/u-boot-nand.lds | 2 +- board/amcc/taihu/flash.c | 10 +- board/amcc/taihu/taihu.c | 9 - board/amcc/walnut/flash.c | 10 +- board/amcc/yucca/cmd_yucca.c | 2 - board/amcc/yucca/flash.c | 12 +- board/amirix/ap1000/ap1000.c | 1 - board/amirix/ap1000/u-boot.lds | 2 +- board/ap325rxa/u-boot.lds | 5 +- board/armadillo/flash.c | 4 +- board/atc/flash.c | 8 +- board/atmel/at91cap9adk/at91cap9adk.c | 29 + board/atmel/at91rm9200dk/at91rm9200dk.c | 2 +- board/atmel/at91rm9200dk/flash.c | 4 +- board/atmel/at91sam9261ek/at91sam9261ek.c | 29 + board/atmel/at91sam9263ek/at91sam9263ek.c | 29 + board/atmel/at91sam9rlek/at91sam9rlek.c | 29 + board/atmel/atngw100/atngw100.c | 18 +- board/atmel/atstk1000/Makefile | 10 +- board/atmel/atstk1000/atstk1000.c | 118 +- board/atmel/atstk1000/ltv350qv.c | 157 + board/atmel/atstk1000/ltv350qv.h | 95 + board/avnet/v5fx30teval/.gitignore | 1 + board/barco/flash.c | 20 +- board/bf533-ezkit/u-boot.lds.S | 2 +- board/bf533-stamp/u-boot.lds.S | 2 +- board/bf537-stamp/u-boot.lds.S | 2 +- board/bf561-ezkit/u-boot.lds.S | 2 +- board/bmw/bmw.c | 2 +- board/bmw/flash.c | 20 +- board/c2mon/flash.c | 16 +- board/c2mon/u-boot.lds | 2 +- board/c2mon/u-boot.lds.debug | 2 +- board/cerf250/flash.c | 4 +- board/cmc_pu2/flash.c | 12 +- board/cmi/cmi.c | 2 +- board/cmi/flash.c | 20 +- board/cobra5272/u-boot.lds | 2 +- board/cogent/flash.c | 20 +- board/cogent/u-boot.lds | 2 +- board/cogent/u-boot.lds.debug | 2 +- board/cpc45/flash.c | 26 +- board/cpu86/flash.c | 16 +- board/cpu87/flash.c | 16 +- board/cradle/flash.c | 4 +- board/cray/L1/u-boot.lds | 2 +- board/cray/L1/u-boot.lds.debug | 2 +- board/csb226/flash.c | 4 +- board/csb272/u-boot.lds | 2 +- board/csb472/u-boot.lds | 2 +- board/cu824/flash.c | 26 +- board/dave/PPChameleonEVB/PPChameleonEVB.c | 25 - board/dave/PPChameleonEVB/u-boot.lds | 2 +- board/delta/nand.c | 6 +- board/dnp1110/flash.c | 4 +- board/earthlcd/favr-32-ezkit/favr-32-ezkit.c | 13 +- board/eltec/bab7xx/u-boot.lds | 2 +- board/eltec/elppc/misc.c | 4 +- board/eltec/elppc/u-boot.lds | 2 +- board/eltec/mhpc/u-boot.lds | 2 +- board/eltec/mhpc/u-boot.lds.debug | 2 +- board/emk/common/flash.c | 8 +- board/emk/top860/u-boot.lds.debug | 2 +- board/ep7312/flash.c | 4 +- board/ep8260/flash.c | 10 +- board/eric/u-boot.lds | 2 +- board/esd/apc405/u-boot.lds | 2 +- board/esd/ar405/u-boot.lds | 4 +- board/esd/ash405/u-boot.lds | 2 +- board/esd/canbt/u-boot.lds | 2 +- board/esd/cms700/u-boot.lds | 2 +- board/esd/cpci2dp/u-boot.lds | 2 +- board/esd/cpci405/cpci405.c | 16 +- board/esd/cpci750/u-boot.lds | 2 +- board/esd/cpciiser4/u-boot.lds | 2 +- board/esd/dasa_sim/u-boot.lds | 2 +- board/esd/dp405/u-boot.lds | 2 +- board/esd/du405/u-boot.lds | 2 +- board/esd/hh405/u-boot.lds | 2 +- board/esd/hub405/u-boot.lds | 2 +- board/esd/ocrtc/u-boot.lds | 2 +- board/esd/pci405/pci405.c | 31 - board/esd/pci405/u-boot.lds | 2 +- board/esd/pf5200/flash.c | 8 +- board/esd/pmc405/u-boot.lds | 2 +- board/esd/pmc440/cmd_pmc440.c | 6 +- board/esd/pmc440/pmc440.c | 6 +- board/esd/pmc440/u-boot-nand.lds | 2 +- board/esd/tasreg/u-boot.lds | 2 +- board/esd/voh405/u-boot.lds | 2 +- board/esd/wuh405/u-boot.lds | 2 +- board/esteem192e/u-boot.lds | 2 +- board/etin/debris/debris.c | 2 +- board/etx094/u-boot.lds | 2 +- board/etx094/u-boot.lds.debug | 2 +- board/evb4510/flash.c | 2 +- board/evb64260/bootseq.txt | 2 +- board/evb64260/flash.c | 8 +- board/evb64260/u-boot.lds | 2 +- board/exbitgen/flash.c | 6 +- board/exbitgen/u-boot.lds | 2 +- board/fads/fads.h | 8 +- board/fads/flash.c | 22 +- board/fads/u-boot.lds | 2 +- board/fads/u-boot.lds.debug | 2 +- board/flagadm/flash.c | 6 +- board/flagadm/u-boot.lds.debug | 2 +- board/freescale/m52277evb/u-boot.lds | 2 +- board/freescale/m5235evb/u-boot.16 | 2 +- board/freescale/m5235evb/u-boot.32 | 2 +- board/freescale/m5235evb/u-boot.lds | 2 +- board/freescale/m5249evb/u-boot.lds | 2 +- board/freescale/m5253demo/u-boot.lds | 2 +- board/freescale/m5253evbe/u-boot.lds | 2 +- board/freescale/m5271evb/u-boot.lds | 2 +- board/freescale/m5272c3/u-boot.lds | 2 +- board/freescale/m5275evb/u-boot.lds | 2 +- board/freescale/m5282evb/u-boot.lds | 2 +- board/freescale/m5329evb/u-boot.lds | 2 +- board/freescale/m5373evb/u-boot.lds | 2 +- board/freescale/m54451evb/u-boot.spa | 2 +- board/freescale/m54451evb/u-boot.stm | 2 +- board/freescale/m54455evb/u-boot.atm | 2 +- board/freescale/m54455evb/u-boot.lds | 2 +- board/freescale/m547xevb/u-boot.lds | 2 +- board/freescale/m548xevb/u-boot.lds | 2 +- board/freescale/mpc7448hpc2/u-boot.lds | 2 +- board/freescale/mpc8260ads/flash.c | 6 +- board/freescale/mpc8266ads/flash.c | 20 +- board/freescale/mx31ads/u-boot.lds | 2 +- board/funkwerk/vovpn-gw/flash.c | 6 +- board/g2000/u-boot.lds | 2 +- board/gcplus/flash.c | 4 +- board/gen860t/flash.c | 20 +- board/gen860t/u-boot-flashenv.lds | 2 +- board/genietv/u-boot.lds | 4 +- board/genietv/u-boot.lds.debug | 4 +- board/gth/u-boot.lds | 2 +- board/gw8260/flash.c | 10 +- board/hermes/u-boot.lds | 2 +- board/hermes/u-boot.lds.debug | 2 +- board/hidden_dragon/flash.c | 20 +- board/hymod/u-boot.lds | 4 +- board/hymod/u-boot.lds.debug | 2 +- board/icecube/flash.c | 8 +- board/icu862/flash.c | 20 +- board/icu862/u-boot.lds | 2 +- board/icu862/u-boot.lds.debug | 2 +- board/idmr/u-boot.lds | 2 +- board/ids8247/flash.c | 20 +- board/impa7/flash.c | 4 +- board/incaip/flash.c | 8 +- board/innokom/flash.c | 6 +- board/integratorcp/flash.c | 6 +- board/ip860/flash.c | 20 +- board/ip860/u-boot.lds | 2 +- board/ip860/u-boot.lds.debug | 2 +- board/iphase4539/flash.c | 6 +- board/ivm/flash.c | 20 +- board/ivm/u-boot.lds | 2 +- board/ivm/u-boot.lds.debug | 2 +- board/ixdp425/flash.c | 4 +- board/jse/u-boot.lds | 2 +- board/korat/korat.c | 12 +- board/kup/common/flash.c | 10 +- board/kup/kup4k/u-boot.lds | 2 +- board/kup/kup4k/u-boot.lds.debug | 2 +- board/kup/kup4x/u-boot.lds | 2 +- board/kup/kup4x/u-boot.lds.debug | 2 +- board/lantec/flash.c | 26 +- board/lantec/u-boot.lds | 2 +- board/lantec/u-boot.lds.debug | 2 +- board/lart/flash.c | 4 +- board/logodl/flash.c | 4 +- board/lpc2292sodimm/flash.c | 4 +- board/lpd7a40x/flash.c | 10 +- board/lubbock/flash.c | 4 +- board/lwmon/flash.c | 26 +- board/lwmon/lwmon.c | 29 + board/lwmon/u-boot.lds | 2 +- board/lwmon/u-boot.lds.debug | 2 +- board/lwmon5/lwmon5.c | 4 +- board/mbx8xx/u-boot.lds.debug | 2 +- board/mcc200/mcc200.c | 8 +- board/mgsuvd/u-boot.lds | 2 +- board/mimc/mimc200/mimc200.c | 93 +- board/miromico/hammerhead/hammerhead.c | 26 +- board/ml2/u-boot.lds | 2 +- board/ml2/u-boot.lds.debug | 2 +- board/modnet50/flash.c | 4 +- board/mousse/u-boot.lds.ram | 2 +- board/mousse/u-boot.lds.rom | 2 +- board/mp2usb/flash.c | 4 +- board/mpc8540eval/flash.c | 20 +- board/mpl/common/common_util.c | 10 +- board/mpl/common/flash.c | 6 +- board/mpl/mip405/u-boot.lds | 2 +- board/mpl/pati/pati.c | 2 +- board/mpl/pip405/u-boot.lds | 2 +- board/mpl/pip405/u-boot.lds.debug | 2 +- board/mpl/vcma9/flash.c | 4 +- board/mpr2/u-boot.lds | 4 +- board/ms7720se/u-boot.lds | 4 +- board/ms7722se/lowlevel_init.S | 56 +- board/ms7722se/u-boot.lds | 4 +- board/ms7750se/u-boot.lds | 4 +- board/muas3001/muas3001.c | 23 +- board/mucmc52/mucmc52.c | 68 +- board/musenki/flash.c | 28 +- board/mx1ads/syncflash.c | 4 +- board/mx1fs2/flash.c | 4 +- board/nc650/flash.c | 20 +- board/netphone/flash.c | 10 +- board/netphone/u-boot.lds | 2 +- board/netphone/u-boot.lds.debug | 2 +- board/netstal/hcu4/u-boot.lds | 2 +- board/netstal/hcu5/README.txt | 2 +- board/netstal/hcu5/hcu5.c | 8 +- board/netstal/mcu25/u-boot.lds | 2 +- board/netta/flash.c | 10 +- board/netta/u-boot.lds | 2 +- board/netta/u-boot.lds.debug | 2 +- board/netta2/flash.c | 10 +- board/netta2/u-boot.lds | 2 +- board/netta2/u-boot.lds.debug | 2 +- board/netvia/flash.c | 10 +- board/netvia/u-boot.lds | 2 +- board/netvia/u-boot.lds.debug | 2 +- board/ns9750dev/flash.c | 4 +- board/nx823/u-boot.lds | 2 +- board/nx823/u-boot.lds.debug | 2 +- board/o2dnt/flash.c | 8 +- board/omap1610inn/flash.c | 4 +- board/omap730p2/flash.c | 4 +- board/oxc/flash.c | 10 +- board/pcippc2/flash.c | 6 +- board/pcippc2/u-boot.lds | 2 +- board/pcs440ep/pcs440ep.c | 4 +- board/pleb2/flash.c | 14 +- board/pm520/flash.c | 6 +- board/pm826/flash.c | 10 +- board/pm828/flash.c | 10 +- board/ppmc7xx/flash.c | 10 +- board/ppmc7xx/u-boot.lds | 2 +- board/prodrive/p3mx/u-boot.lds | 2 +- board/prodrive/pdnb3/flash.c | 8 +- board/purple/flash.c | 8 +- board/purple/purple.c | 1 - board/purple/u-boot.lds | 2 +- board/quad100hd/quad100hd.c | 5 - board/quantum/u-boot.lds | 2 +- board/quantum/u-boot.lds.debug | 2 +- board/r2dplus/r2dplus.c | 1 + board/r2dplus/u-boot.lds | 4 +- board/r360mpi/flash.c | 20 +- board/r360mpi/u-boot.lds | 4 +- board/r7780mp/lowlevel_init.S | 3 +- board/r7780mp/u-boot.lds | 4 +- board/rbc823/u-boot.lds | 2 +- board/rmu/flash.c | 16 +- board/rmu/u-boot.lds | 2 +- board/rmu/u-boot.lds.debug | 2 +- board/rpxsuper/flash.c | 10 +- board/rsdproto/flash.c | 14 +- board/rsk7203/rsk7203.c | 21 + board/rsk7203/u-boot.lds | 4 +- board/sacsng/flash.c | 20 +- board/samsung/smdk6400/lowlevel_init.S | 32 +- board/sandburst/karef/u-boot.lds | 2 +- board/sandburst/karef/u-boot.lds.debug | 2 +- board/sandburst/metrobox/u-boot.lds | 2 +- board/sandburst/metrobox/u-boot.lds.debug | 2 +- board/sandpoint/flash.c | 20 +- board/sbc2410x/flash.c | 4 +- board/sbc405/u-boot.lds | 2 +- board/sbc8260/flash.c | 10 +- board/sc3/u-boot.lds | 2 +- board/sc520_cdp/flash.c | 6 +- board/sc520_cdp/flash_old.c | 6 +- board/sc520_spunk/flash.c | 6 +- board/scb9328/flash.c | 4 +- board/sh7763rdp/u-boot.lds | 4 +- board/sh7785lcr/config.mk | 1 - board/sh7785lcr/lowlevel_init.S | 1 - board/sh7785lcr/rtl8169.h | 1 - board/sh7785lcr/rtl8169_mac.c | 1 - board/sh7785lcr/selfcheck.c | 5 +- board/sh7785lcr/u-boot.lds | 5 +- board/shannon/flash.c | 4 +- board/siemens/CCM/u-boot.lds | 2 +- board/siemens/CCM/u-boot.lds.debug | 2 +- board/siemens/IAD210/u-boot.lds | 2 +- board/siemens/SCM/flash.c | 10 +- board/siemens/SMN42/flash.c | 4 +- board/siemens/pcu_e/flash.c | 26 +- board/siemens/pcu_e/u-boot.lds | 2 +- board/siemens/pcu_e/u-boot.lds.debug | 2 +- board/sixnet/flash.c | 14 +- board/sixnet/u-boot.lds | 2 +- board/sl8245/flash.c | 26 +- board/sl8245/sl8245.c | 1 - board/smdk2400/flash.c | 10 +- board/smdk2410/flash.c | 4 +- board/snmc/qs850/u-boot.lds | 2 +- board/snmc/qs860t/u-boot.lds | 2 +- board/socrates/ddr.c | 2 +- board/socrates/socrates.c | 66 +- board/spc1920/u-boot.lds | 2 +- board/spd8xx/u-boot.lds | 2 +- board/spd8xx/u-boot.lds.debug | 2 +- board/ssv/adnpesc1/flash.c | 2 +- board/stxgp3/flash.c | 20 +- board/stxssa/stxssa.c | 1 - board/stxxtc/u-boot.lds | 2 +- board/stxxtc/u-boot.lds.debug | 2 +- board/svm_sc8xx/flash.c | 16 +- board/svm_sc8xx/u-boot.lds | 2 +- board/svm_sc8xx/u-boot.lds.debug | 2 +- board/tqc/tqm5200/cam5200_flash.c | 12 +- board/tqc/tqm8260/flash.c | 10 +- board/tqc/tqm85xx/tqm85xx.c | 10 +- board/tqc/tqm8xx/Makefile | 2 +- board/tqc/tqm8xx/flash.c | 834 ----- board/tqc/tqm8xx/tqm8xx.c | 149 +- board/tqc/tqm8xx/u-boot.lds | 2 +- board/tqc/tqm8xx/u-boot.lds.debug | 2 +- board/trab/Makefile | 1 + board/trab/flash.c | 10 +- board/trab/u-boot.lds | 2 +- board/uc100/u-boot.lds | 2 +- board/uc100/u-boot.lds.debug | 2 +- board/utx8245/flash.c | 20 +- board/v37/u-boot.lds | 2 +- board/w7o/u-boot.lds.debug | 2 +- board/wepep250/flash.c | 4 +- board/westel/amx860/flash.c | 26 +- board/westel/amx860/u-boot.lds | 2 +- board/westel/amx860/u-boot.lds.debug | 2 +- board/xaeniax/flash.c | 4 +- board/xilinx/ml300/ml300.c | 2 +- board/xilinx/ml300/u-boot.lds | 2 +- board/xilinx/ml300/u-boot.lds.debug | 2 +- board/xilinx/ml507/.gitignore | 1 + board/xilinx/ppc440-generic/.gitignore | 1 + board/xilinx/ppc440-generic/config.mk | 2 +- board/xilinx/xilinx_enet/emac_adapter.c | 4 +- board/xilinx/xilinx_iic/iic_adapter.c | 16 +- board/xm250/flash.c | 4 +- board/xpedite1k/u-boot.lds | 2 +- board/xpedite1k/u-boot.lds.debug | 2 +- board/xsengine/flash.c | 2 +- board/zeus/zeus.c | 35 +- board/zylonite/flash.c | 4 +- board/zylonite/nand.c | 6 +- common/Makefile | 41 +- common/cmd_autoscript.c | 4 +- common/cmd_bdinfo.c | 2 +- common/cmd_bootm.c | 23 + common/cmd_eeprom.c | 6 - common/cmd_fdc.c | 12 - common/cmd_fdt.c | 3 +- common/cmd_i2c.c | 1 - common/cmd_itest.c | 2 - common/cmd_mac.c | 3 - common/cmd_mem.c | 33 - common/cmd_nvedit.c | 30 +- common/cmd_pci.c | 2 - common/cmd_portio.c | 2 - common/cmd_vfd.c | 2 - common/command.c | 24 + common/env_common.c | 8 +- common/env_dataflash.c | 19 +- common/env_eeprom.c | 19 +- common/env_embedded.c | 208 ++ common/env_flash.c | 89 +- common/env_nand.c | 85 +- common/env_nowhere.c | 5 - common/env_nvram.c | 29 +- common/env_onenand.c | 11 +- common/env_sf.c | 39 +- common/environment.c | 208 -- common/fdt_support.c | 4 +- common/image.c | 3 +- common/lcd.c | 100 +- config.mk | 9 - cpu/arm1136/mx31/interrupts.c | 24 +- cpu/arm920t/at91rm9200/i2c.c | 10 + cpu/arm920t/imx/interrupts.c | 2 +- cpu/arm920t/imx/serial.c | 56 +- cpu/arm920t/start.S | 6 +- cpu/arm926ejs/davinci/dp83848.c | 27 +- cpu/arm926ejs/davinci/nand.c | 81 +- cpu/at32ap/Makefile | 3 +- cpu/at32ap/at32ap700x/Makefile | 2 +- cpu/at32ap/at32ap700x/clk.c | 25 + cpu/at32ap/at32ap700x/gpio.c | 199 -- cpu/at32ap/at32ap700x/portmux.c | 218 ++ cpu/at32ap/cpu.c | 3 - cpu/at32ap/pio.c | 116 - cpu/at32ap/portmux-gpio.c | 107 + cpu/at32ap/portmux-pio.c | 92 + cpu/mcf52x2/cpu.c | 1 - cpu/mpc5xx/u-boot.lds | 2 +- cpu/mpc5xxx/u-boot-customlayout.lds | 2 +- cpu/mpc85xx/interrupts.c | 14 +- cpu/mpc85xx/release.S | 5 + cpu/mpc8xx/cpu_init.c | 2 +- cpu/mpc8xx/scc.c | 10 +- cpu/mpc8xxx/ddr/main.c | 30 +- cpu/ppc4xx/sdram.c | 14 +- cpu/pxa/mmc.c | 4 +- cpu/sh4/watchdog.c | 53 +- disk/part.c | 10 +- doc/README.AVR32 | 24 +- doc/README.AVR32-port-muxing | 208 ++ doc/README.mx31 | 17 + doc/README.nand | 8 + doc/README.nios | 8 +- doc/README.qemu_mips | 8 +- doc/README.sh7785lcr | 1 - drivers/hwmon/lm75.c | 4 + drivers/mtd/cfi_flash.c | 20 +- drivers/mtd/nand/fsl_elbc_nand.c | 56 +- drivers/net/mpc512x_fec.c | 2 +- drivers/net/tsec.c | 8 +- drivers/net/xilinx_emaclite.c | 2 +- drivers/pci/pci_sh7751.c | 24 +- drivers/pci/pci_sh7780.c | 15 +- drivers/rtc/mc13783-rtc.c | 6 +- drivers/serial/serial_sh.c | 2 +- drivers/video/atmel_lcdfb.c | 6 +- include/asm-arm/arch-at91/gpio.h | 1 + include/asm-arm/mach-types.h | 3645 ++++++++++++++++++++- include/asm-avr32/arch-at32ap700x/chip-features.h | 5 + include/asm-avr32/arch-at32ap700x/clk.h | 106 +- include/asm-avr32/arch-at32ap700x/gpio.h | 184 +- include/asm-avr32/arch-at32ap700x/portmux.h | 92 + include/asm-avr32/arch-common/portmux-gpio.h | 193 ++ include/asm-avr32/arch-common/portmux-pio.h | 138 + include/asm-avr32/global_data.h | 1 + include/asm-avr32/initcalls.h | 1 - include/asm-avr32/sdram.h | 4 +- include/asm-sh/cache.h | 14 +- include/asm-sh/io.h | 109 +- include/asm-sh/pci.h | 1 + include/command.h | 9 + include/configs/A3000.h | 8 +- include/configs/ADCIOP.h | 16 +- include/configs/ADNPESC1.h | 14 +- include/configs/AMX860.h | 6 +- include/configs/AP1000.h | 26 +- include/configs/APC405.h | 6 +- include/configs/AR405.h | 12 +- include/configs/ASH405.h | 6 +- include/configs/ATUM8548.h | 8 +- include/configs/Adder.h | 6 +- include/configs/Alaska8220.h | 50 +- include/configs/AmigaOneG3SE.h | 6 +- include/configs/B2.h | 8 +- include/configs/BAB7xx.h | 6 +- include/configs/BC3450.h | 14 +- include/configs/BMW.h | 8 +- include/configs/CANBT.h | 14 +- include/configs/CATcenter.h | 10 +- include/configs/CCM.h | 16 +- include/configs/CMS700.h | 6 +- include/configs/CPC45.h | 10 +- include/configs/CPCI2DP.h | 6 +- include/configs/CPCI405.h | 14 +- include/configs/CPCI4052.h | 14 +- include/configs/CPCI405AB.h | 6 +- include/configs/CPCI405DT.h | 14 +- include/configs/CPCI750.h | 16 +- include/configs/CPCIISER4.h | 6 +- include/configs/CPU86.h | 14 +- include/configs/CPU87.h | 14 +- include/configs/CRAYL1.h | 10 +- include/configs/CU824.h | 14 +- include/configs/DASA_SIM.h | 10 +- include/configs/DB64360.h | 10 +- include/configs/DB64460.h | 10 +- include/configs/DK1C20.h | 10 +- include/configs/DK1S10.h | 14 +- include/configs/DP405.h | 6 +- include/configs/DU405.h | 6 +- include/configs/DU440.h | 20 +- include/configs/EB+MCF-EV123.h | 18 +- include/configs/ELPPC.h | 10 +- include/configs/ELPT860.h | 20 +- include/configs/EP1C20.h | 8 +- include/configs/EP1S10.h | 8 +- include/configs/EP1S40.h | 8 +- include/configs/EP88x.h | 6 +- include/configs/ERIC.h | 50 +- include/configs/ESTEEM192E.h | 6 +- include/configs/ETX094.h | 10 +- include/configs/EVB64260.h | 8 +- include/configs/EXBITGEN.h | 20 +- include/configs/FADS823.h | 6 +- include/configs/FADS850SAR.h | 6 +- include/configs/FLAGADM.h | 6 +- include/configs/FPS850L.h | 12 +- include/configs/FPS860L.h | 12 +- include/configs/G2000.h | 12 +- include/configs/GEN860T.h | 18 +- include/configs/GENIETV.h | 6 +- include/configs/GTH.h | 10 +- include/configs/HH405.h | 6 +- include/configs/HIDDEN_DRAGON.h | 6 +- include/configs/HMI10.h | 12 +- include/configs/HUB405.h | 6 +- include/configs/IAD210.h | 6 +- include/configs/ICU862.h | 8 +- include/configs/IDS8247.h | 8 +- include/configs/IP860.h | 24 +- include/configs/IPHASE4539.h | 6 +- include/configs/ISPAN.h | 12 +- include/configs/IVML24.h | 6 +- include/configs/IVMS8.h | 6 +- include/configs/IceCube.h | 18 +- include/configs/JSE.h | 12 +- include/configs/KAREF.h | 10 +- include/configs/KUP4K.h | 12 +- include/configs/KUP4X.h | 12 +- include/configs/LANTEC.h | 6 +- include/configs/M52277EVB.h | 8 +- include/configs/M5235EVB.h | 16 +- include/configs/M5249EVB.h | 8 +- include/configs/M5253DEMO.h | 12 +- include/configs/M5253EVBE.h | 12 +- include/configs/M5271EVB.h | 8 +- include/configs/M5272C3.h | 14 +- include/configs/M5275EVB.h | 14 +- include/configs/M5282EVB.h | 6 +- include/configs/M5329EVB.h | 8 +- include/configs/M5373EVB.h | 8 +- include/configs/M54451EVB.h | 18 +- include/configs/M54455EVB.h | 24 +- include/configs/M5475EVB.h | 8 +- include/configs/M5485EVB.h | 8 +- include/configs/MBX.h | 6 +- include/configs/MBX860T.h | 6 +- include/configs/METROBOX.h | 10 +- include/configs/MHPC.h | 6 +- include/configs/MIP405.h | 6 +- include/configs/ML2.h | 26 +- include/configs/MOUSSE.h | 14 +- include/configs/MPC8260ADS.h | 12 +- include/configs/MPC8266ADS.h | 12 +- include/configs/MPC8313ERDB.h | 30 +- include/configs/MPC8315ERDB.h | 14 +- include/configs/MPC8323ERDB.h | 16 +- include/configs/MPC832XEMDS.h | 16 +- include/configs/MPC8349EMDS.h | 18 +- include/configs/MPC8349ITX.h | 16 +- include/configs/MPC8360EMDS.h | 16 +- include/configs/MPC8360ERDK.h | 14 +- include/configs/MPC837XEMDS.h | 16 +- include/configs/MPC837XERDB.h | 14 +- include/configs/MPC8536DS.h | 14 +- include/configs/MPC8540ADS.h | 14 +- include/configs/MPC8540EVAL.h | 20 +- include/configs/MPC8541CDS.h | 8 +- include/configs/MPC8544DS.h | 10 +- include/configs/MPC8548CDS.h | 8 +- include/configs/MPC8555CDS.h | 8 +- include/configs/MPC8560ADS.h | 14 +- include/configs/MPC8568MDS.h | 8 +- include/configs/MPC8572DS.h | 10 +- include/configs/MPC8610HPCD.h | 16 +- include/configs/MPC8641HPCN.h | 16 +- include/configs/MUSENKI.h | 8 +- include/configs/MVBC_P.h | 14 +- include/configs/MVBLM7.h | 14 +- include/configs/MVBLUE.h | 8 +- include/configs/MVS1.h | 6 +- include/configs/MigoR.h | 12 +- include/configs/NC650.h | 8 +- include/configs/NETPHONE.h | 16 +- include/configs/NETTA.h | 16 +- include/configs/NETTA2.h | 16 +- include/configs/NETVIA.h | 16 +- include/configs/NSCU.h | 10 +- include/configs/NX823.h | 10 +- include/configs/OCRTC.h | 14 +- include/configs/ORSG.h | 14 +- include/configs/OXC.h | 8 +- include/configs/P3G4.h | 8 +- include/configs/PATI.h | 16 +- include/configs/PCI405.h | 14 +- include/configs/PCI5441.h | 8 +- include/configs/PCIPPC2.h | 8 +- include/configs/PCIPPC6.h | 8 +- include/configs/PIP405.h | 6 +- include/configs/PK1C20.h | 8 +- include/configs/PLU405.h | 6 +- include/configs/PM520.h | 10 +- include/configs/PM826.h | 14 +- include/configs/PM828.h | 14 +- include/configs/PM854.h | 14 +- include/configs/PM856.h | 14 +- include/configs/PMC405.h | 6 +- include/configs/PMC440.h | 32 +- include/configs/PN62.h | 6 +- include/configs/PPChameleonEVB.h | 16 +- include/configs/QS823.h | 8 +- include/configs/QS850.h | 8 +- include/configs/QS860T.h | 8 +- include/configs/R360MPI.h | 8 +- include/configs/RBC823.h | 6 +- include/configs/RPXClassic.h | 14 +- include/configs/RPXlite.h | 6 +- include/configs/RPXlite_DW.h | 14 +- include/configs/RPXsuper.h | 24 +- include/configs/RRvision.h | 10 +- include/configs/Rattler.h | 10 +- include/configs/SBC8540.h | 20 +- include/configs/SCM.h | 14 +- include/configs/SL8245.h | 8 +- include/configs/SM850.h | 19 +- include/configs/SMN42.h | 10 +- include/configs/SPD823TS.h | 6 +- include/configs/SX1.h | 16 +- include/configs/SXNI855T.h | 18 +- include/configs/Sandpoint8240.h | 6 +- include/configs/Sandpoint8245.h | 6 +- include/configs/TASREG.h | 8 +- include/configs/TB5200.h | 18 +- include/configs/TK885D.h | 12 +- include/configs/TOP5200.h | 8 +- include/configs/TOP860.h | 6 +- include/configs/TQM5200.h | 18 +- include/configs/TQM823L.h | 12 +- include/configs/TQM823M.h | 14 +- include/configs/TQM8260.h | 14 +- include/configs/TQM8272.h | 12 +- include/configs/TQM834x.h | 14 +- include/configs/TQM850L.h | 12 +- include/configs/TQM850M.h | 14 +- include/configs/TQM855L.h | 12 +- include/configs/TQM855M.h | 14 +- include/configs/TQM85xx.h | 32 +- include/configs/TQM860L.h | 12 +- include/configs/TQM860M.h | 16 +- include/configs/TQM862L.h | 12 +- include/configs/TQM862M.h | 16 +- include/configs/TQM866M.h | 16 +- include/configs/TQM885D.h | 12 +- include/configs/Total5200.h | 10 +- include/configs/VCMA9.h | 16 +- include/configs/VOH405.h | 6 +- include/configs/VOM405.h | 6 +- include/configs/VoVPN-GW.h | 8 +- include/configs/W7OLMC.h | 18 +- include/configs/W7OLMG.h | 18 +- include/configs/WUH405.h | 6 +- include/configs/XPEDITE1K.h | 6 +- include/configs/Yukon8220.h | 50 +- include/configs/ZPC1900.h | 14 +- include/configs/ZUMA.h | 8 +- include/configs/acadia.h | 26 +- include/configs/actux1.h | 8 +- include/configs/actux2.h | 8 +- include/configs/actux3.h | 8 +- include/configs/actux4.h | 8 +- include/configs/ads5121.h | 16 +- include/configs/aev.h | 14 +- include/configs/alpr.h | 12 +- include/configs/ap325rxa.h | 13 +- include/configs/apollon.h | 8 +- include/configs/armadillo.h | 8 +- include/configs/assabet.h | 14 +- include/configs/at91cap9adk.h | 18 +- include/configs/at91rm9200dk.h | 24 +- include/configs/at91sam9260ek.h | 26 +- include/configs/at91sam9261ek.h | 18 +- include/configs/at91sam9263ek.h | 18 +- include/configs/at91sam9rlek.h | 18 +- include/configs/atc.h | 14 +- include/configs/atngw100.h | 8 +- include/configs/atstk1002.h | 33 +- include/configs/atstk1003.h | 8 +- include/configs/atstk1004.h | 8 +- include/configs/atstk1006.h | 34 +- include/configs/bamboo.h | 36 +- include/configs/barco.h | 6 +- include/configs/bf533-ezkit.h | 6 +- include/configs/bf533-stamp.h | 16 +- include/configs/bf537-stamp.h | 16 +- include/configs/bf561-ezkit.h | 6 +- include/configs/bubinga.h | 26 +- include/configs/c2mon.h | 6 +- include/configs/canmb.h | 8 +- include/configs/canyonlands.h | 28 +- include/configs/cerf250.h | 8 +- include/configs/cm4008.h | 6 +- include/configs/cm41xx.h | 6 +- include/configs/cm5200.h | 12 +- include/configs/cmc_pu2.h | 10 +- include/configs/cmi_mpc5xx.h | 8 +- include/configs/cobra5272.h | 14 +- include/configs/cogent_mpc8260.h | 10 +- include/configs/cogent_mpc8xx.h | 10 +- include/configs/cpci5200.h | 14 +- include/configs/cradle.h | 8 +- include/configs/csb226.h | 6 +- include/configs/csb272.h | 16 +- include/configs/csb472.h | 16 +- include/configs/csb637.h | 20 +- include/configs/davinci_dvevm.h | 20 +- include/configs/davinci_schmoogie.h | 10 +- include/configs/davinci_sffsdr.h | 10 +- include/configs/davinci_sonata.h | 16 +- include/configs/dbau1x00.h | 6 +- include/configs/debris.h | 8 +- include/configs/delta.h | 10 +- include/configs/dnp1110.h | 8 +- include/configs/eXalion.h | 10 +- include/configs/ebony.h | 28 +- include/configs/ep7312.h | 8 +- include/configs/ep8248.h | 10 +- include/configs/ep8260.h | 24 +- include/configs/ep82xxm.h | 22 +- include/configs/evb4510.h | 12 +- include/configs/favr-32-ezkit.h | 8 +- include/configs/gcplus.h | 8 +- include/configs/gr_cpci_ax2000.h | 12 +- include/configs/gr_ep2s60.h | 12 +- include/configs/gr_xc3s_1500.h | 12 +- include/configs/grsim.h | 12 +- include/configs/grsim_leon2.h | 12 +- include/configs/gth2.h | 6 +- include/configs/gw8260.h | 24 +- include/configs/hammerhead.h | 8 +- include/configs/hcu4.h | 24 +- include/configs/hcu5.h | 26 +- include/configs/hermes.h | 6 +- include/configs/hmi1001.h | 12 +- include/configs/hymod.h | 8 +- include/configs/idmr.h | 14 +- include/configs/impa7.h | 8 +- include/configs/imx31_litekit.h | 13 +- include/configs/imx31_phycore.h | 8 +- include/configs/incaip.h | 6 +- include/configs/inka4x0.h | 8 +- include/configs/innokom.h | 6 +- include/configs/integratorap.h | 6 +- include/configs/integratorcp.h | 16 +- include/configs/ixdp425.h | 10 +- include/configs/ixdpg425.h | 12 +- include/configs/jupiter.h | 12 +- include/configs/katmai.h | 12 +- include/configs/kb9202.h | 12 +- include/configs/kilauea.h | 28 +- include/configs/korat.h | 12 +- include/configs/kvme080.h | 8 +- include/configs/lart.h | 8 +- include/configs/linkstation.h | 8 +- include/configs/logodl.h | 6 +- include/configs/lpc2292sodimm.h | 8 +- include/configs/lpd7a400.h | 8 +- include/configs/lpd7a404.h | 8 +- include/configs/luan.h | 16 +- include/configs/lubbock.h | 10 +- include/configs/lwmon.h | 8 +- include/configs/lwmon5.h | 12 +- include/configs/m501sk.h | 26 +- include/configs/makalu.h | 16 +- include/configs/mcc200.h | 12 +- include/configs/mcu25.h | 24 +- include/configs/mecp5200.h | 14 +- include/configs/mgcoge.h | 10 +- include/configs/mgsuvd.h | 12 +- include/configs/mimc200.h | 14 +- include/configs/ml300.h | 8 +- include/configs/ml401.h | 20 +- include/configs/ml507.h | 10 +- include/configs/modnet50.h | 12 +- include/configs/motionpro.h | 12 +- include/configs/mp2usb.h | 10 +- include/configs/mpc7448hpc2.h | 8 +- include/configs/mpr2.h | 8 +- include/configs/ms7720se.h | 8 +- include/configs/ms7722se.h | 14 +- include/configs/ms7750se.h | 8 +- include/configs/muas3001.h | 58 +- include/configs/mucmc52.h | 12 +- include/configs/munices.h | 16 +- include/configs/mx1ads.h | 10 +- include/configs/mx1fs2.h | 8 +- include/configs/mx31ads.h | 17 +- include/configs/netstar.h | 12 +- include/configs/ns9750dev.h | 12 +- include/configs/o2dnt.h | 8 +- include/configs/ocotea.h | 28 +- include/configs/omap1510.h | 2 +- include/configs/omap1510inn.h | 12 +- include/configs/omap1610h2.h | 10 +- include/configs/omap1610inn.h | 10 +- include/configs/omap2420h4.h | 16 +- include/configs/omap5912osk.h | 10 +- include/configs/omap730.h | 2 +- include/configs/omap730p2.h | 10 +- include/configs/p3mx.h | 10 +- include/configs/p3p440.h | 12 +- include/configs/pb1x00.h | 6 +- include/configs/pcs440ep.h | 16 +- include/configs/pcu_e.h | 16 +- include/configs/pdnb3.h | 16 +- include/configs/pf5200.h | 14 +- include/configs/pleb2.h | 10 +- include/configs/ppmc7xx.h | 20 +- include/configs/ppmc8260.h | 30 +- include/configs/purple.h | 6 +- include/configs/pxa255_idp.h | 10 +- include/configs/qemu-mips.h | 6 +- include/configs/quad100hd.h | 21 +- include/configs/quantum.h | 14 +- include/configs/r2dplus.h | 8 +- include/configs/r7780mp.h | 8 +- include/configs/redwood.h | 16 +- include/configs/rmu.h | 10 +- include/configs/rsdproto.h | 6 +- include/configs/rsk7203.h | 8 +- include/configs/sacsng.h | 28 +- include/configs/sbc2410x.h | 10 +- include/configs/sbc405.h | 10 +- include/configs/sbc8240.h | 10 +- include/configs/sbc8260.h | 30 +- include/configs/sbc8349.h | 18 +- include/configs/sbc8548.h | 8 +- include/configs/sbc8560.h | 20 +- include/configs/sbc8641d.h | 10 +- include/configs/sc3.h | 14 +- include/configs/sc520_cdp.h | 8 +- include/configs/sc520_spunk.h | 16 +- include/configs/scb9328.h | 8 +- include/configs/sequoia.h | 26 +- include/configs/sh7763rdp.h | 14 +- include/configs/sh7785lcr.h | 12 +- include/configs/shannon.h | 12 +- include/configs/smdk2400.h | 12 +- include/configs/smdk2410.h | 10 +- include/configs/smdk6400.h | 8 +- include/configs/smmaco4.h | 14 +- include/configs/socrates.h | 23 +- include/configs/sorcery.h | 30 +- include/configs/spc1920.h | 6 +- include/configs/spieval.h | 14 +- include/configs/stxgp3.h | 14 +- include/configs/stxssa.h | 24 +- include/configs/stxxtc.h | 16 +- include/configs/suzaku.h | 6 +- include/configs/svm_sc8xx.h | 18 +- include/configs/taihu.h | 24 +- include/configs/taishan.h | 12 +- include/configs/tb0229.h | 6 +- include/configs/trab.h | 20 +- include/configs/trizepsiv.h | 14 +- include/configs/uc100.h | 12 +- include/configs/uc101.h | 12 +- include/configs/utx8245.h | 14 +- include/configs/v37.h | 8 +- include/configs/v38b.h | 8 +- include/configs/v5fx30teval.h | 10 +- include/configs/versatile.h | 12 +- include/configs/virtlab2.h | 12 +- include/configs/voiceblue.h | 12 +- include/configs/walnut.h | 26 +- include/configs/wepep250.h | 8 +- include/configs/xaeniax.h | 8 +- include/configs/xilinx-ppc440-generic.h | 10 +- include/configs/xilinx-ppc440.h | 2 +- include/configs/xm250.h | 8 +- include/configs/xsengine.h | 10 +- include/configs/xupv2p.h | 6 +- include/configs/yosemite.h | 26 +- include/configs/yucca.h | 18 +- include/configs/zeus.h | 20 +- include/configs/zylonite.h | 10 +- include/environment.h | 56 +- include/fdt.h | 2 + include/fdt_support.h | 2 +- include/image.h | 1 + include/lcd.h | 2 + include/linux/list.h | 22 +- include/lzma/LzmaDecode.h | 31 + include/lzma/LzmaTools.h | 31 + include/lzma/LzmaTypes.h | 31 + include/netdev.h | 1 - include/spartan3.h | 15 +- include/spi.h | 15 +- include/tsec.h | 2 - lib_avr32/board.c | 22 +- lib_avr32/bootm.c | 2 +- lib_blackfin/board.c | 2 +- lib_blackfin/bootm.c | 2 +- lib_generic/lzma/LGPL.txt | 502 +++ lib_generic/lzma/LzmaDecode.c | 584 ++++ lib_generic/lzma/LzmaDecode.h | 113 + lib_generic/lzma/LzmaTools.c | 142 + lib_generic/lzma/LzmaTools.h | 35 + lib_generic/lzma/LzmaTypes.h | 45 + lib_generic/lzma/Makefile | 49 + lib_generic/lzma/README.txt | 28 + lib_generic/lzma/history.txt | 198 ++ lib_generic/lzma/import_lzmasdk.sh | 38 + lib_generic/lzma/lzma.txt | 663 ++++ lib_m68k/board.c | 14 +- lib_microblaze/bootm.c | 2 +- lib_mips/board.c | 12 +- lib_nios2/bootm.c | 1 - lib_ppc/board.c | 18 +- lib_ppc/bootm.c | 5 +- lib_sh/board.c | 115 +- lib_sh/bootm.c | 46 +- lib_sparc/board.c | 6 +- tools/.gitignore | 2 +- tools/Makefile | 12 +- tools/env/fw_env.c | 20 +- tools/envcrc.c | 32 +- tools/updater/flash_hw.c | 6 +- 968 files changed, 13906 insertions(+), 6515 deletions(-) create mode 100644 README.imx31 create mode 100644 board/atmel/atstk1000/ltv350qv.c create mode 100644 board/atmel/atstk1000/ltv350qv.h create mode 100644 board/avnet/v5fx30teval/.gitignore delete mode 100644 board/tqc/tqm8xx/flash.c create mode 100644 board/xilinx/ml507/.gitignore create mode 100644 board/xilinx/ppc440-generic/.gitignore create mode 100644 common/env_embedded.c delete mode 100644 common/environment.c delete mode 100644 cpu/at32ap/at32ap700x/gpio.c create mode 100644 cpu/at32ap/at32ap700x/portmux.c delete mode 100644 cpu/at32ap/pio.c create mode 100644 cpu/at32ap/portmux-gpio.c create mode 100644 cpu/at32ap/portmux-pio.c create mode 100644 doc/README.AVR32-port-muxing create mode 100644 doc/README.mx31 create mode 100644 include/asm-avr32/arch-at32ap700x/portmux.h create mode 100644 include/asm-avr32/arch-common/portmux-gpio.h create mode 100644 include/asm-avr32/arch-common/portmux-pio.h create mode 100644 include/lzma/LzmaDecode.h create mode 100644 include/lzma/LzmaTools.h create mode 100644 include/lzma/LzmaTypes.h create mode 100644 lib_generic/lzma/LGPL.txt create mode 100644 lib_generic/lzma/LzmaDecode.c create mode 100644 lib_generic/lzma/LzmaDecode.h create mode 100644 lib_generic/lzma/LzmaTools.c create mode 100644 lib_generic/lzma/LzmaTools.h create mode 100644 lib_generic/lzma/LzmaTypes.h create mode 100644 lib_generic/lzma/Makefile create mode 100644 lib_generic/lzma/README.txt create mode 100644 lib_generic/lzma/history.txt create mode 100644 lib_generic/lzma/import_lzmasdk.sh create mode 100644 lib_generic/lzma/lzma.txt diff --git a/CHANGELOG b/CHANGELOG index fdb12dc..85dc920 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,751 @@ +commit 7c803be2eb3cae245dedda438776e08fb122250f +Author: Wolfgang Denk +Date: Tue Sep 16 18:02:19 2008 +0200 + + TQM8xx: Fix CFI flash driver support for all TQM8xx based boards + + After switching to using the CFI flash driver, the correct remapping + of the flash banks was forgotten. + + Also, some boards were not adapted, and the old legacy flash driver + was not removed yet. + + Signed-off-by: Wolfgang Denk + +commit c0d2f87d6c450128b88e73eea715fa3654f65b6c +Author: Wolfgang Denk +Date: Sun Sep 14 00:59:35 2008 +0200 + + Prepare v2008.10-rc2 + + Signed-off-by: Wolfgang Denk + +commit f12e4549b6fb01cd2654348af95a3c7a6ac161e7 +Author: Wolfgang Denk +Date: Sat Sep 13 02:23:05 2008 +0200 + + Coding style cleanup, update CHANGELOG + + Signed-off-by: Wolfgang Denk + +commit 0c32565f536609d78feef35c88bbc39d3ac53a73 +Author: Peter Tyser +Date: Wed Sep 10 09:18:34 2008 -0500 + + Update mailing list email and archive addresses + + Signed-off-by: Peter Tyser + +commit fb661ea444ae61de60520f66ae84cdb5dd5a3246 +Author: u-boot@bugs.denx.de +Date: Thu Sep 11 15:40:01 2008 +0200 + + 85xx: socrates: autoprobe Lime chip + + This patch is an attempt to implement autoprobing for the Lime + presence on the bus. + Configure GPCM for Lime CS2 and try to access chip ID registers. + Second read atempt delivers register values if the chip is present. + + Signed-off-by: Anatolij Gustschin + +commit e99b607a5ec56ce66e0bcccb78480d5e16fb7bc5 +Author: u-boot@bugs.denx.de +Date: Thu Sep 11 15:40:01 2008 +0200 + + 85xx: socrates: Add support for new image format. + + Signed-off-by: Detlev Zundel + +commit 3c094b652d4107b34641f300a8e9fe16ca15e3d8 +Author: Nobuhiro Iwamatsu +Date: Thu Sep 11 17:28:18 2008 +0900 + + sh: Fix compile error for r2dplus + + netdev.h was not include by r2dplus. + + Signed-off-by: Nobuhiro Iwamatsu + +commit 56844a22b76c719e600047e23b80465a44d76abd +Author: Heiko Schocher +Date: Thu Sep 11 08:11:23 2008 +0200 + + powerpc: Fix bootm to boot up again with a Ramdisk + + Commit 2a1a2cb6 didnt remove the dummy mem reservation in fdt_chosen, + and this stopped Linux from booting with a Ramdisk. This patch fixes + this, by deleting the useless dummy mem reservation. + + When booting with a Ramdisk, a fix offset FDT_RAMDISK_OVERHEAD is now + added to of_size, so we dont need anymore a dummy mem reservation. + + I measured the value of FDT_RAMDISK_OVERHEAD on a MPC8270 based + system (=0x44 bytes) and rounded it up to 0x80). + + Signed-off-by: Heiko Schocher + Acked-by: Kumar Gala + +commit fc9c1727b5b3483ce49c3cb668e8332fb001b8a7 +Author: Luigi 'Comio' Mantellini +Date: Mon Sep 8 02:46:13 2008 +0200 + + Add support for LZMA uncompression algorithm. + + Signed-off-by: Luigi 'Comio' Mantellini + Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD + +commit 0008b6d968160abe2bfd936493f3a516a7c8da20 +Author: Anton Vorontsov +Date: Fri Jun 27 23:04:20 2008 +0400 + + fsl_elbc_nand: ecclayout cleanups + + This patch deletes oobavail assignments, they're calculated by the nand + core code in nand_scan_tail, plus current oobavail values are wrong for + the LP NANDs. + + Signed-off-by: Anton Vorontsov + Signed-off-by: David Woodhouse + Signed-off-by: Scott Wood + +commit 8f42bf1c393d53a70c2545e9f329d11c46d74794 +Author: Anton Vorontsov +Date: Fri Jun 27 23:04:13 2008 +0400 + + fsl_elbc_nand: implement support for flash-based BBT + + This patch implements support for flash-based BBT for chips working + through ELBC NAND controller, so that NAND core will not have to re-scan + for bad blocks on every boot. + + Because ELBC controller may provide HW-generated ECCs we should adjust + bbt pattern and bbt version positions in the OOB free area. + + Signed-off-by: Anton Vorontsov + Signed-off-by: David Woodhouse + Signed-off-by: Scott Wood + +commit 97ae023648e764f794ffb9c52da109d6caf09c47 +Author: Anton Vorontsov +Date: Fri Jun 27 23:04:04 2008 +0400 + + fsl_elbc_nand: fix OOB workability for large page NAND chips + + For large page chips, nand_bbt is looking into OOB area, and checking + for "0xff 0xff" pattern at OOB offset 0. That is, two bytes should be + reserved for bbt means. + + But ELBC driver is specifying ecclayout so that oobfree area starts at + offset 1, so only one byte left for the bbt purposes. + + This causes problems with any OOB users, namely JFFS2: after first mount + JFFS2 will fill all OOBs with "erased marker", so OOBs will contain: + + OOB Data: ff 19 85 20 03 00 ff ff ff 00 00 08 ff ff ff ff + OOB Data: ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff + OOB Data: ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff + OOB Data: ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff + + And on the next boot, NAND core will rescan for bad blocks, then will + see "0xff 0x19" pattern, and will mark all blocks as bad ones. + + To fix the issue we should implement our own bad block pattern: just one + byte at OOB start. Though, this will work only for x8 chips. For x16 + chips two bytes must be checked. Since ELBC driver does not support x16 + NANDs (yet), we're safe for now. + + Signed-off-by: Anton Vorontsov + Signed-off-by: David Woodhouse + Signed-off-by: Scott Wood + +commit 7238ada313057a85409485b8ee21515dc10c07a5 +Author: Wolfgang Denk +Date: Fri Sep 12 13:52:21 2008 +0200 + + MPC512x: reduce timeout waiting for Ethernet autonegotiation to 2.5s + + Signed-off-by: Wolfgang Denk + +commit b18410e508a12ba0a177dfc2a386857c806fa96d +Author: Stefan Roese +Date: Thu Sep 11 13:05:56 2008 +0200 + + ppc4xx: Enable device tree (FDT) support in zeus board port + + Signed-off-by: Stefan Roese + +commit 7bf5ecfa50722a9feb45ea8f04da75f5d406f20b +Author: Stefan Roese +Date: Wed Sep 10 16:53:47 2008 +0200 + + ppc4xx: Fix SDRAM inititialization of multiple 405 based board ports + + This patch fixes a problem introdiced with patch + bbeff30c [ppc4xx: Remove superfluous dram_init() call or replace it by + initdram()]. + + The boards affected are: + - PCI405 + - PPChameleonEVB + - quad100hd + - taihu + - zeus + + Signed-off-by: Stefan Roese + +commit 61737c59a3285f6fadf96a5836879898c04ec28d +Author: Ricardo Ribalda Delgado +Date: Thu Sep 11 19:41:26 2008 -0400 + + ppc4xx: Add .gitignore file to xilinx-ppc440 boards + + Signed-off-by: Ricardo Ribalda Delgado + Signed-off-by: Stefan Roese + +commit 2bec498ed1164a58cd8437b561bdc4551d69f9bf +Author: Ricardo Ribalda Delgado +Date: Thu Sep 11 19:41:25 2008 -0400 + + ppc4xx: Fix compilation of v5fx30teval_flash + + Signed-off-by: Ricardo Ribalda Delgado + Signed-off-by: Stefan Roese + +commit 4bed9deebbd7ee6f0ba746b44d47a922156f7404 +Author: Ricardo Ribalda Delgado +Date: Wed Sep 10 17:44:30 2008 -0400 + + ppc4xx: Fix in-tree build for ppc440-generic boards + + Signed-off-by: Ricardo Ribalda Delgado + Signed-off-by: Stefan Roese + +commit 06c4ab50f5ccfb55ea2dd324aa28b2b06102e416 +Author: Jean-Christophe PLAGNIOL-VILLARD +Date: Fri Sep 12 02:20:47 2008 +0200 + + ARM: synchronize mach-types.h with linux 2.6.27-rc6 + + Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD + +commit 3ee9f03f588ad605e3fd10530237f9e3e2e7ab4c +Author: Jens Scharsig +Date: Fri Sep 12 02:20:47 2008 +0200 + + at91rm9200: fix errors with CONFIG_CMD_I2C_TREE + + This patch prevents linker error on AT91RM9200 boards, if + CONFIG_CMD_I2_TREE is set. + It implements i2c_set_bus_speed and i2c_get_bus_speed as a dummy function. + + Signed-off-by: Jens Scharsig + +commit b5b0344957d32e3d07a8dd72fce64fb48e680ba4 +Author: Hugo Villeneuve +Date: Fri Sep 12 02:20:47 2008 +0200 + + ARM DaVinci: Remove duplicate code in cpu/arm926ejs/davinci/dp83848.c + + ARM DaVinci: Remove duplicate code in cpu/arm926ejs/davinci/dp83848.c + + Signed-off-by: Hugo Villeneuve + +commit 03db53335c8eba656a7c44d1555b1a4514383e33 +Author: Shinya Kuribayashi +Date: Fri Sep 12 02:20:46 2008 +0200 + + make: Remove redundant __ARM__ addition when cross-compiling on *BSD + + __ARM__ is given by arm_config.mk automatically. + + Signed-off-by: Shinya Kuribayashi + +commit 8cc62a7d9c77f8ef5166fb57322c4a6ddac320b4 +Author: Claudio Scordino +Date: Fri Sep 12 02:20:46 2008 +0200 + + Fix MACH_TYPE for the AT91RM9200DK board. + + Signed-off-by: Claudio Scordino + +commit 274737e5eb25b2bcd3af3a96da923effd543284f +Author: Andrew Dyer +Date: Fri Sep 12 02:20:46 2008 +0200 + + i.mx change get_timer(base) to return time since base + + This patch changes get_timer() for i.MX to return the time since + 'base' instead of the time since the counter was at zero. + + Symptom seen is flash timeout errors when erasing or programming a + sector using the common cfi flash code. + + Signed-off-by: Andrew Dyer + +commit 48fed40575b3e8eae960eb0141509ddd9a73012a +Author: Andrew Dyer +Date: Fri Sep 12 02:20:46 2008 +0200 + + i.MX use u-boot baud rate and don't assume UART master clock + + 1) Change the i.MX serial driver to use the baud rate set in the + u-boot environment + + 2) don't assume a 16MHz value for PERCLK1 in baud rate calculations + + 3) don't write a 1 to the RDR bit in the USR2 reg. (bit is not "write + one to clear" like other status bits in the reg.) + + Signed-off-by: Andrew Dyer + +commit 6e1551a870d360805b9d172dc56d935064abe71d +Author: Andrew Dyer +Date: Fri Sep 12 02:20:46 2008 +0200 + + arm920t fix constant error in start.S + + Code in cpu/arm920t/start.S will die with a compilation error if + CONFIG_STACKSIZE + CFG_MALLOC_LEN works out to an invalid constant for + the ARM sub instruction. Change the code so that each is subtracted + independently to avoid the error. + + Signed-off-by: Andrew Dyer + +commit b23253835f871cd9bd8e955b9a971d18a7d4ff56 +Author: Gururaja Hebbar K R +Date: Fri Sep 12 02:20:40 2008 +0200 + + ARM OMAP : Correct Invalid Timer Register Field Declaration in omap1510.h & omap730.h + + - Correct Invalid #define of MPUTIM_PTV_MASK for + omap1510 & omap730 register definition + + MPUTIM_PTV_MASK is defined as + #define MPUTIM_PTV_MASK (0x7< + +commit c455d07396dddc9864fd8dbb965ee10fe95ce8cf +Author: Adrian Filipi +Date: Fri Jul 18 11:52:02 2008 -0400 + + Set up SD/MMC OCR as comment describes. i.e. 3.2-3.4v. + + Signed-off-by: Adrian Filipi + +commit eb16135df20535b0d19969f50fb5bd17f95e9c25 +Author: Guennadi Liakhovetski +Date: Thu Aug 28 12:25:11 2008 +0200 + + i.MX31: document timer precision option + + Signed-off-by: Guennadi Liakhovetski + +commit 1a6337b01351b82a45b0defa76f08744511c580b +Author: Magnus Lilja +Date: Fri Aug 29 10:36:18 2008 +0200 + + i.MX31: Make the SPI bus and chip select configurable for MC13783 + + The i.MX31 has three SPI buses and each bus has several chip selects + and the MC13783 chip can be connected to any of these. The current + RTC driver for MC13783 is hardcoded for CSPI2/SS2. + + This patch makes make MC13783 SPI bus and chip select configurable + via CONFIG_MC13783_SPI_BUS and CONFIG_MC13783_SPI_CS. + + Signed-off-by: Magnus Lilja + +commit 8c4ebec25b21e355b8488698ec1594da9701fff4 +Author: Magnus Lilja +Date: Fri Aug 29 10:36:17 2008 +0200 + + i.MX31: Add reset_timer() and modify get_timer_masked(). + + This patch adds the reset_timer() function (needed by nand_base.c) and + modifies the get_timer_masked() to work in the same way as the omap24xx + function. + + Signed-off-by: Magnus Lilja + +commit deeec4991a55de243787002ede24d2331d234fc8 +Author: Jean-Christophe PLAGNIOL-VILLARD +Date: Wed Sep 10 22:48:09 2008 +0200 + + ap325rxa: remove duplicate CONFIG_FLASH_CFI_DRIVER + + Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD + +commit a3a08c0cedd329edf5256e1d6b2bad0fca002725 +Author: Jean-Christophe PLAGNIOL-VILLARD +Date: Wed Sep 10 22:48:09 2008 +0200 + + bootm arm/avr32/blackfin/microblaze/nios2/sh: remove no more need 'error' label + + Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD + +commit 0e8d158664a913392cb01fb11a948d83f72e105e +Author: Jean-Christophe PLAGNIOL-VILLARD +Date: Wed Sep 10 22:48:06 2008 +0200 + + rename CFG_ENV macros to CONFIG_ENV + + Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD + +commit 1ede78710c3bf9ad6f4a53aaddc3bcc86fedd9df +Author: Jean-Christophe PLAGNIOL-VILLARD +Date: Wed Sep 10 22:48:05 2008 +0200 + + nvedit: rename error comment to CONFIG_ENV_IS_IN_ + + Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD + +commit b64b775e7546ed138df360ceb3a71ee358cb9a01 +Author: Jean-Christophe PLAGNIOL-VILLARD +Date: Wed Sep 10 22:48:05 2008 +0200 + + cmd_mem: Move conditional compilation to Makefile + + Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD + +commit 8a40fb148efa442d6526eac46a2001e4c64d28ff +Author: Jean-Christophe PLAGNIOL-VILLARD +Date: Wed Sep 10 22:48:05 2008 +0200 + + move cmd_get_data_size to command.c + + add CMD_DATA_SIZE macro to enable it + + Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD + +commit 507641d2491980531932b9f25dab37fe5e6c3a1a +Author: Jean-Christophe PLAGNIOL-VILLARD +Date: Wed Sep 10 22:48:04 2008 +0200 + + env_flash: Move conditional compilation to Makefile + + Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD + +commit 5a1aceb0689e2f731491838970884a673ef7e7d3 +Author: Jean-Christophe PLAGNIOL-VILLARD +Date: Wed Sep 10 22:48:04 2008 +0200 + + rename CFG_ENV_IS_IN_FLASH in CONFIG_ENV_IS_IN_FLASH + + Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD + +commit 7d9b5bae5ba558c7464d89d033aca04acaf01172 +Author: Jean-Christophe PLAGNIOL-VILLARD +Date: Wed Sep 10 22:48:03 2008 +0200 + + cleanup use of CFG_ENV_IS_IN_FLASH + + - #if CFG_ENV_IS_IN_FLASH + - #if (CFG_ENV_IS_IN_FLASH == 1) + - #define CFG_ENV_IS_IN_FLASH 0 + + Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD + +commit 0cf4fd3cf8d0e00605bec5fc56f89c6415015a46 +Author: Jean-Christophe PLAGNIOL-VILLARD +Date: Wed Sep 10 22:48:01 2008 +0200 + + rename environment.c in env_embedded.c to reflect is functionality + + Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD + +commit c0878af6e32f0fd8e13a6ca315b9add64441115a +Author: Jean-Christophe PLAGNIOL-VILLARD +Date: Wed Sep 10 22:48:01 2008 +0200 + + env_nowhere: Move conditional compilation to Makefile + + Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD + +commit 93f6d72544da4510a146bc4c93d609b0116cde37 +Author: Jean-Christophe PLAGNIOL-VILLARD +Date: Wed Sep 10 22:48:00 2008 +0200 + + rename CFG_ENV_IS_NOWHERE in CONFIG_ENV_IS_NOWHERE + + Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD + +commit 2556ef78113b5f089dfcac5da90bf31dd568397b +Author: Jean-Christophe PLAGNIOL-VILLARD +Date: Wed Sep 10 22:48:00 2008 +0200 + + env_sf: Move conditional compilation to Makefile + + Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD + +commit 0b5099a8419bf9c828df5e3e2c6878dc300d98e3 +Author: Jean-Christophe PLAGNIOL-VILLARD +Date: Wed Sep 10 22:48:00 2008 +0200 + + rename CFG_ENV_IS_IN_SPI_FLASH in CONFIG_ENV_IS_IN_SPI_FLASH + + Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD + +commit 55c5f49910ec8225347aa1d211352a84de6649b4 +Author: Jean-Christophe PLAGNIOL-VILLARD +Date: Wed Sep 10 22:48:00 2008 +0200 + + env_onenand: Move conditional compilation to Makefile + + Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD + +commit 9656138ff1a34d4c4768db6b490deffc40ee674b +Author: Jean-Christophe PLAGNIOL-VILLARD +Date: Wed Sep 10 22:47:59 2008 +0200 + + rename CFG_ENV_IS_IN_ONENAND in CONFIG_ENV_IS_IN_ONENAND + + Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD + +commit 957a0e69575683efd70ace147746bbb3d8e7c501 +Author: Jean-Christophe PLAGNIOL-VILLARD +Date: Wed Sep 10 22:47:59 2008 +0200 + + env_nvram: Move conditional compilation to Makefile + + Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD + +commit 9314cee6917444ab88bd4e758da7a30975120187 +Author: Jean-Christophe PLAGNIOL-VILLARD +Date: Wed Sep 10 22:47:59 2008 +0200 + + rename CFG_ENV_IS_IN_NVRAM in CONFIG_ENV_IS_IN_NVRAM + + Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD + +commit 06f61354397911a4c121dfa51b6ccbf7e300d48b +Author: Jean-Christophe PLAGNIOL-VILLARD +Date: Wed Sep 10 22:47:59 2008 +0200 + + env_nand: Move conditional compilation to Makefile + + Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD + +commit 51bfee192099206a4397f15f3b93516e01f58ab0 +Author: Jean-Christophe PLAGNIOL-VILLARD +Date: Wed Sep 10 22:47:58 2008 +0200 + + rename CFG_ENV_IS_IN_NAND in CONFIG_ENV_IS_IN_NAND + + Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD + +commit d8cc04d0ac9c7c0d12454708aaf5489f8532bbf9 +Author: Jean-Christophe PLAGNIOL-VILLARD +Date: Wed Sep 10 22:47:58 2008 +0200 + + env_dataflash: Move conditional compilation to Makefile + + Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD + +commit 057c849c45b9ee19df8ff3acdeee66be52819962 +Author: Jean-Christophe PLAGNIOL-VILLARD +Date: Wed Sep 10 22:47:58 2008 +0200 + + rename CFG_ENV_IS_IN_DATAFLASH in CONFIG_ENV_IS_IN_DATAFLASH + + Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD + +commit d1034bc8db60fa6bd419328baf6a75cb0645cee8 +Author: Jean-Christophe PLAGNIOL-VILLARD +Date: Wed Sep 10 22:47:52 2008 +0200 + + cmd_eeprom: Move conditional compilation to Makefile + + Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD + +commit bf5a7710ec70e90e98f451b4ba0eb65f9ffc34eb +Author: Jean-Christophe PLAGNIOL-VILLARD +Date: Fri Sep 5 09:19:54 2008 +0200 + + env_eeprom: Move conditional compilation to Makefile + + Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD + +commit bb1f8b4f8bb0bfce52e0faa4637b975b745824b3 +Author: Jean-Christophe PLAGNIOL-VILLARD +Date: Fri Sep 5 09:19:30 2008 +0200 + + rename CFG_ENV_IS_IN_EEPROM in CONFIG_ENV_IS_IN_EEPROM + + Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD + +commit 32628c5008105a732212003d83b75f05e5243bb2 +Author: Jean-Christophe PLAGNIOL-VILLARD +Date: Sat Aug 30 23:54:58 2008 +0200 + + cmd_mac: Move conditional compilation to Makefile + + finish remaning CFG_ID_EEPROM in CONFIG_ID_EEPROM + start in commit ad8f8687b78c3e917b173f038926695383c55555 + + Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD + +commit e5648acab153f0f429bfc714902c5aaa7879f71b +Author: Jean-Christophe PLAGNIOL-VILLARD +Date: Sat Aug 30 23:47:41 2008 +0200 + + cmd_fdc: Move conditional compilation to Makefile + + Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD + +commit 2d02d91d530e831f2dab228085963fc1d5b71cb0 +Author: Jean-Christophe PLAGNIOL-VILLARD +Date: Sat Aug 30 23:47:38 2008 +0200 + + common/Makefile: add core command section + + Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD + +commit 0d92d4a699fb1a39381d98571dc51fb97e5bcf9e +Author: Jean-Christophe PLAGNIOL-VILLARD +Date: Sat Aug 30 23:29:57 2008 +0200 + + cmd_vfd: Move conditional compilation to Makefile + + Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD + +commit 6644641d072aee3087da129d8443187196a4d8a9 +Author: Scott Wood +Date: Wed Sep 10 11:48:49 2008 -0500 + + delta, zylonite: Update nand_oobinfo to nand_ecclayout. + + This is part of the switch to newer upstream MTD code. + + Signed-off-by: Scott Wood + +commit 9b05aa788bfdd3264ff1bc9418cb19550a7234e4 +Author: Hugo Villeneuve +Date: Sat Aug 30 17:06:55 2008 -0400 + + ARM DaVinci: Fix broken HW ECC for large page NAND. + + Based on original patch by Bernard Blackham + + U-boot's HW ECC support for large page NAND on Davinci is completely + broken. Some kernels, such as the 2.6.10 one supported by + MontaVista for DaVinci, rely upon this broken behaviour as they + share the same code for ECCs. In the existing scheme, error + detection *might* work on large page, but error correction + definitely does not. Small page ECC correction works, but the + format is not compatible with the mainline git kernel. + + This patch adds ECC code that matches what is currently in the + Davinci git repository (since NAND support was added in 2.6.24). + This makes the ECC and OOB layout written by u-boot compatible with + Linux for both small page and large page devices and fixes ECC + correction for large page devices. + + The old behaviour can be restored by defining the macro + CFG_DAVINCI_BROKEN_ECC, which is undefined by default. + + Signed-off-by: Hugo Villeneuve + Acked-by: Sergey Kubushyn + Signed-off-by: Scott Wood + +commit 0b7c5639891f4103a0e31ec7ae0beb3e97ed3836 +Author: Heiko Schocher +Date: Wed Sep 10 11:15:28 2008 +0200 + + muas3001: update BR4 settings + + Also set up the port pins for using I2C. + + Signed-off-by: Heiko Schocher + +commit 3591293509e0c0bcf244b0f974775bff2e25697e +Author: Petri Lehtinen +Date: Wed Sep 10 09:43:49 2008 +0300 + + autoscr: Fix one-character lines and non-newline terminated scripts + + When not using hush, the autoscr command now executes lines that are + only one character long. It also runs the last line of scripts even if + it does not end in a newline. + + Signed-off-by: Petri Lehtinen + +commit 9ebbb54f7a25055010fa6668eba40c72a4c4f985 +Author: Victor Gallardo +Date: Tue Sep 9 15:13:29 2008 -0700 + + ppc4xx: Allow DTT_I2C_DEV_CODE configured by CFG_I2C_DTT_ADDR + + On AMCC Arches board DTT_I2C_DEV_CODE is different then canyonlands + and glacier. + + Signed-off-by: Victor Gallardo + +commit 245f6ef3e11828cb46188e396fb1e67f7b07cd03 +Author: Heiko Schocher +Date: Mon Sep 8 10:21:11 2008 +0200 + + muas3001: added support for the LM75 sensor. + + Signed-off-by: Heiko Schocher + +commit 4a02a2dca82aeab8f839db9dd35fda9d5412dacb +Author: Heiko Schocher +Date: Mon Sep 8 10:20:19 2008 +0200 + + muas3001: activate WDT for the muas3001 board. + + Signed-off-by: Heiko Schocher + +commit a55d074dac24dc941f1afb5b4e94b1509bfdda4e +Author: Heiko Schocher +Date: Mon Sep 8 10:19:36 2008 +0200 + + muas3001: added 64MB SDRAM autodetection. + + Signed-off-by: Heiko Schocher + +commit 5251469943895de4bb9a04d5053352cc22acb7d5 +Author: Andrew Klossner +Date: Thu Aug 21 07:12:26 2008 -0700 + + Fix printf errors under -DDEBUG + + Fix printf format-string/arg mismatches under -DDEBUG. + + These warnings occur with DEBUG defined for a platform using + cpu/mpc85xx. Users of other architectures can unearth similar + problems by adding the line "CFLAGS += -DDEBUG=1" in config.mk right + after "CFLAGS += $(call cc-option,-fno-stack-protector)". + + Signed-off-by: Andrew Klossner + Signed-off-by: Andy Fleming + +commit 8b9e4787641719d709bfa2ebeb72e8bd4952bee7 +Author: Wolfgang Denk +Date: Tue Sep 9 23:55:18 2008 +0200 + + Update CHANGELOG, prepare 2008-10-rc1 release + + Signed-off-by: Wolfgang Denk + +commit e0ff3d350d6b7960deb5a881dfc5acf3a63ef676 +Author: Kumar Gala +Date: Mon Sep 8 08:51:29 2008 -0500 + + 85xx: Ensure timebase is zero on secondary cores + + The e500um says the timebase is volatile out of reset. To ensure + TB sync works we need to make sure its zero. + + Signed-off-by: Kumar Gala + commit 54b4ab3c961a2012a1c2a09c259a6343323ec551 Author: Jean-Christophe PLAGNIOL-VILLARD Date: Tue Sep 9 22:18:24 2008 +0200 @@ -56,6 +804,16 @@ Date: Wed Aug 6 16:08:41 2008 -0500 Signed-off-by: Jason McMullan Signed-off-by: TsiChung Liew +commit 4bc07c368076560ed7fa4c9f987c71a8521488a9 +Author: Wolfgang Denk +Date: Tue Sep 9 17:55:31 2008 +0200 + + trab: fix build problem after change to use do_div() + + We must link with libgeneric now. + + Signed-off-by: Wolfgang Denk + commit 3b20fd83c73c22acfcb0c6663be747bd5c8b7011 Author: Ryan CHEN Date: Wed Aug 20 13:00:17 2008 -0400 @@ -351,6 +1109,48 @@ Date: Tue Sep 9 10:03:47 2008 +0200 Signed-off-by: Wolfgang Denk +commit 6cc64f9b5f69239c8b1969572b5a3a4aab7de5b9 +Author: Sergei Poselenov +Date: Fri Aug 15 15:42:11 2008 +0200 + + Removed hardcoded MxMR loop value from upmconfig() for MPC85xx. + + Signed-off-by: Sergei Poselenov + +commit 36241ca29d4804a1006fb3f26069effda5202581 +Author: Anatolij Gustschin +Date: Fri Aug 15 15:42:13 2008 +0200 + + 85xx: socrates: Enable Lime support. + + This patch adds Lime GDC support together with support for the PWM + backlight control through the w83782d chip. The reset pin of the + latter is attached to GPIO, so we need to reset it in + early_board_init_r. + + Signed-off-by: Anatolij Gustschin + +commit 7a47753ddcaebbf2142809842f70c5f723bd9ddb +Author: Detlev Zundel +Date: Fri Aug 15 15:42:12 2008 +0200 + + 85xx: Socrates: Major code update. + + - Update the local bus ranges in the FDT for Linux for the various + devices connected to the local bus via chip-select. + + - Set the LCRR_DBYP bit in the LCRR for local bus frequencies + lower than 66 MHz and uses I/O accessor functions consequently. + + - UPM data update. + + - Update of default environment and configuration. Use I2C multibus + as we do have two I2C buses. Also enable sdram and ext2 commands. + + Signed-off-by: Wolfgang Grandegger + Signed-off-by: Sergei Poselenov + Signed-off-by: Detlev Zundel + commit 4d2ae70e8c31c22e5710df5ff236b5565ea2cf2c Author: Jean-Christophe PLAGNIOL-VILLARD Date: Tue Sep 9 01:22:39 2008 +0200 @@ -409,6 +1209,19 @@ Date: Thu Aug 14 14:08:28 2008 +0200 Signed-off-by: Sergei Poselenov Signed-off-by: Wolfgang Denk +commit 8febd13c69cb68652577d1a9fcbde954bf784155 +Author: Timur Tabi +Date: Fri Jul 18 16:52:23 2008 +0200 + + Update Freescale 85xx boards to sys_eeprom.c + + The new sys_eeprom.c supports both the old CCID EEPROM format and the new NXID + format, and so it obsoletes board/freescale/common/cds_eeprom.c. Freescale + 86xx boards already use sys_eeprom.c, so this patch migrates the remaining + Freescale 85xx boards to use it as well. cds_eeprom.c is deleted. + + Signed-off-by: Timur Tabi + commit 1055171ed05b7c4885737463d52b8d6c013bcb5d Author: Wolfgang Denk Date: Mon Sep 8 23:26:22 2008 +0200 diff --git a/MAINTAINERS b/MAINTAINERS index 64d8409..750e374 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -4,7 +4,7 @@ # # # For any board without permanent maintainer, please contact # # Wolfgang Denk # -# and Cc: the mailing lists. # +# and Cc: the mailing list. # # # # Note: lists sorted by Maintainer Name # ######################################################################### diff --git a/Makefile b/Makefile index e8bbd78..7c13ce8 100644 --- a/Makefile +++ b/Makefile @@ -24,7 +24,7 @@ VERSION = 2008 PATCHLEVEL = 10 SUBLEVEL = -EXTRAVERSION = -rc1 +EXTRAVERSION = -rc2 ifneq "$(SUBLEVEL)" "" U_BOOT_VERSION = $(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION) else @@ -203,6 +203,7 @@ endif OBJS := $(addprefix $(obj),$(OBJS)) LIBS = lib_generic/libgeneric.a +LIBS += lib_generic/lzma/liblzma.a LIBS += $(shell if [ -f board/$(VENDOR)/common/Makefile ]; then echo \ "board/$(VENDOR)/common/lib$(VENDOR).a"; fi) LIBS += cpu/$(CPU)/lib$(CPU).a @@ -1063,7 +1064,7 @@ RPXlite_DW_config: unconfig $(XECHO) "... with LCD display ..."; \ } @[ -z "$(findstring _NVRAM,$@)" ] || \ - { echo "#define CFG_ENV_IS_IN_NVRAM" >>$(obj)include/config.h ; \ + { echo "#define CONFIG_ENV_IS_IN_NVRAM" >>$(obj)include/config.h ; \ $(XECHO) "... with ENV in NVRAM ..."; \ } @$(MKCONFIG) -a RPXlite_DW ppc mpc8xx RPXlite_dw @@ -1488,9 +1489,9 @@ v5fx30teval_flash_config: unconfig @mkdir -p $(obj)include $(obj)board/xilinx/ppc440-generic @mkdir -p $(obj)include $(obj)board/avnet/v5fx30teval @echo "LDSCRIPT:=$(SRCTREE)/board/xilinx/ppc440-generic/u-boot-rom.lds"\ - > $(obj)/board/avnet/v5fx30teval/config.tmp + > $(obj)board/avnet/v5fx30teval/config.tmp @echo "TEXT_BASE := 0xFF1C0000" \ - >> $(obj)/board/avnet/v5fx30teval/config.tmp + >> $(obj)board/avnet/v5fx30teval/config.tmp @$(MKCONFIG) v5fx30teval ppc ppc4xx v5fx30teval avnet VOH405_config: unconfig @@ -3213,7 +3214,7 @@ clobber: clean @rm -f $(OBJS) $(obj)*.bak $(obj)ctags $(obj)etags $(obj)TAGS \ $(obj)cscope.* $(obj)*.*~ @rm -f $(obj)u-boot $(obj)u-boot.map $(obj)u-boot.hex $(ALL) - @rm -f $(obj)tools/{crc32.c,environment.c,env/crc32.c,md5.c,sha1.c,inca-swap-bytes} + @rm -f $(obj)tools/{crc32.c,env_embedded.c,env/crc32.c,md5.c,sha1.c,inca-swap-bytes} @rm -f $(obj)tools/{image.c,fdt.c,fdt_ro.c,fdt_rw.c,fdt_strerror.c,zlib.h} @rm -f $(obj)tools/{fdt_wip.c,libfdt_internal.h} @rm -f $(obj)cpu/mpc824x/bedbug_603e.c diff --git a/README b/README index b5e4086..ccd839c 100644 --- a/README +++ b/README @@ -60,10 +60,10 @@ Where to get help: In case you have questions about, problems with or contributions for U-Boot you should send a message to the U-Boot mailing list at -. There is also an archive of -previous traffic on the mailing list - please search the archive -before asking FAQ's. Please see -http://lists.sourceforge.net/lists/listinfo/u-boot-users/ +. There is also an archive of previous traffic +on the mailing list - please search the archive before asking FAQ's. +Please see http://lists.denx.de/pipermail/u-boot and +http://dir.gmane.org/gmane.comp.boot-loaders.u-boot Where to get source code: @@ -1044,6 +1044,29 @@ The following options need to be configured: the malloc area (as defined by CFG_MALLOC_LEN) should be at least 4MB. + CONFIG_LZMA + + If this option is set, support for lzma compressed + images is included. + + Note: The LZMA algorithm adds between 2 and 4KB of code and it + requires an amount of dynamic memory that is given by the + formula: + + (1846 + 768 << (lc + lp)) * sizeof(uint16) + + Where lc and lp stand for, respectively, Literal context bits + and Literal pos bits. + + This value is upper-bounded by 14MB in the worst case. Anyway, + for a ~4MB large kernel image, we have lc=3 and lp=0 for a + total amount of (1846 + 768 << (3 + 0)) * 2 = ~41KB... that is + a very small buffer. + + Use the lzmainfo tool to determinate the lc and lp values and + then calculate the amount of needed dynamic memory (ensuring + the appropriate CFG_MALLOC_LEN value). + - MII/PHY support: CONFIG_PHY_ADDR @@ -1392,6 +1415,12 @@ The following options need to be configured: If defined, then this indicates the I2C bus number for the DTT. If not defined, then U-Boot assumes that DTT is on I2C bus 0. + CFG_I2C_DTT_ADDR: + + If defined, specifies the I2C address of the DTT device. + If not defined, then U-Boot uses predefined value for + specified DTT device. + CONFIG_FSL_I2C Define this option if you want to use Freescale's I2C driver in @@ -2098,7 +2127,7 @@ The following definitions that deal with the placement and management of environment data (variable area); in general, we support the following configurations: -- CFG_ENV_IS_IN_FLASH: +- CONFIG_ENV_IS_IN_FLASH: Define this if the environment is in flash memory. @@ -2114,22 +2143,22 @@ following configurations: environment in one of the last sectors, leaving a gap between U-Boot and the environment. - - CFG_ENV_OFFSET: + - CONFIG_ENV_OFFSET: Offset of environment data (variable area) to the beginning of flash memory; for instance, with bottom boot type flash chips the second sector can be used: the offset for this sector is given here. - CFG_ENV_OFFSET is used relative to CFG_FLASH_BASE. + CONFIG_ENV_OFFSET is used relative to CFG_FLASH_BASE. - - CFG_ENV_ADDR: + - CONFIG_ENV_ADDR: This is just another way to specify the start address of the flash sector containing the environment (instead of - CFG_ENV_OFFSET). + CONFIG_ENV_OFFSET). - - CFG_ENV_SECT_SIZE: + - CONFIG_ENV_SECT_SIZE: Size of the sector containing the environment. @@ -2138,10 +2167,10 @@ following configurations: In such a case you don't want to spend a whole sector for the environment. - - CFG_ENV_SIZE: + - CONFIG_ENV_SIZE: - If you use this in combination with CFG_ENV_IS_IN_FLASH - and CFG_ENV_SECT_SIZE, you can specify to use only a part + If you use this in combination with CONFIG_ENV_IS_IN_FLASH + and CONFIG_ENV_SECT_SIZE, you can specify to use only a part of this flash sector for the environment. This saves memory for the RAM copy of the environment. @@ -2155,8 +2184,8 @@ following configurations: wrong before the contents has been restored from a copy in RAM, your target system will be dead. - - CFG_ENV_ADDR_REDUND - CFG_ENV_SIZE_REDUND + - CONFIG_ENV_ADDR_REDUND + CONFIG_ENV_SIZE_REDUND These settings describe a second storage area used to hold a redundant copy of the environment data, so that there is @@ -2168,14 +2197,14 @@ source code will make it necessary to adapt /u-boot.lds* accordingly! -- CFG_ENV_IS_IN_NVRAM: +- CONFIG_ENV_IS_IN_NVRAM: Define this if you have some non-volatile memory device (NVRAM, battery buffered SRAM) which you want to use for the environment. - - CFG_ENV_ADDR: - - CFG_ENV_SIZE: + - CONFIG_ENV_ADDR: + - CONFIG_ENV_SIZE: These two #defines are used to determine the memory area you want to use for environment. It is assumed that this memory @@ -2193,13 +2222,13 @@ keep settings there always unmodified except somebody uses "saveenv" to save the current settings. -- CFG_ENV_IS_IN_EEPROM: +- CONFIG_ENV_IS_IN_EEPROM: Use this if you have an EEPROM or similar serial access device and a driver for it. - - CFG_ENV_OFFSET: - - CFG_ENV_SIZE: + - CONFIG_ENV_OFFSET: + - CONFIG_ENV_SIZE: These two #defines specify the offset and size of the environment area within the total memory of your EEPROM. @@ -2236,39 +2265,39 @@ to save the current settings. The size in bytes of the EEPROM device. -- CFG_ENV_IS_IN_DATAFLASH: +- CONFIG_ENV_IS_IN_DATAFLASH: Define this if you have a DataFlash memory device which you want to use for the environment. - - CFG_ENV_OFFSET: - - CFG_ENV_ADDR: - - CFG_ENV_SIZE: + - CONFIG_ENV_OFFSET: + - CONFIG_ENV_ADDR: + - CONFIG_ENV_SIZE: These three #defines specify the offset and size of the environment area within the total memory of your DataFlash placed at the specified address. -- CFG_ENV_IS_IN_NAND: +- CONFIG_ENV_IS_IN_NAND: Define this if you have a NAND device which you want to use for the environment. - - CFG_ENV_OFFSET: - - CFG_ENV_SIZE: + - CONFIG_ENV_OFFSET: + - CONFIG_ENV_SIZE: These two #defines specify the offset and size of the environment area within the first NAND device. - - CFG_ENV_OFFSET_REDUND + - CONFIG_ENV_OFFSET_REDUND - This setting describes a second storage area of CFG_ENV_SIZE + This setting describes a second storage area of CONFIG_ENV_SIZE size used to hold a redundant copy of the environment data, so that there is a valid backup copy in case there is a power failure during a "saveenv" operation. - Note: CFG_ENV_OFFSET and CFG_ENV_OFFSET_REDUND must be aligned - to a block boundary, and CFG_ENV_SIZE must be a multiple of + Note: CONFIG_ENV_OFFSET and CONFIG_ENV_OFFSET_REDUND must be aligned + to a block boundary, and CONFIG_ENV_SIZE must be a multiple of the NAND devices block size. - CFG_SPI_INIT_OFFSET diff --git a/README.imx31 b/README.imx31 new file mode 100644 index 0000000..f545f01 --- /dev/null +++ b/README.imx31 @@ -0,0 +1,13 @@ +i.MX31 specific Configuration Options: +-------------------------------------- + +- Timer precision: + CONFIG_MX31_TIMER_HIGH_PRECISION + + Enable higher precision timer. The low-precision timer + (default) provides approximately 4% error, whereas the + high-precision timer is about 0.4% accurate. The extra + accuracy is achieved at the cost of higher computational + overhead, which, in places where time is measured, should + not be critical, so, it should be safe to enable this + option. diff --git a/api/api.c b/api/api.c index 19c7154..f51ebb7 100644 --- a/api/api.c +++ b/api/api.c @@ -534,7 +534,7 @@ static int API_env_enum(va_list ap) for (i = 0; env_get_char(i) != '\0'; i = n + 1) { for (n = i; env_get_char(n) != '\0'; ++n) { - if (n >= CFG_ENV_SIZE) { + if (n >= CONFIG_ENV_SIZE) { /* XXX shouldn't we set *next = NULL?? */ return 0; } diff --git a/board/BuS/EB+MCF-EV123/u-boot.lds b/board/BuS/EB+MCF-EV123/u-boot.lds index 4a880e6..b22b332 100644 --- a/board/BuS/EB+MCF-EV123/u-boot.lds +++ b/board/BuS/EB+MCF-EV123/u-boot.lds @@ -63,7 +63,7 @@ SECTIONS lib_generic/zlib.o (.text) /* . = env_offset; */ - common/environment.o(.text) + common/env_embedded.o(.text) *(.text) *(.fixup) diff --git a/board/LEOX/elpt860/README.LEOX b/board/LEOX/elpt860/README.LEOX index 9052b09..25524af 100644 --- a/board/LEOX/elpt860/README.LEOX +++ b/board/LEOX/elpt860/README.LEOX @@ -106,7 +106,7 @@ version - print monitor version ? - alias for 'help' ################################################## -# Environment Variables (CFG_ENV_IS_IN_NVRAM) +# Environment Variables (CONFIG_ENV_IS_IN_NVRAM) ############################## LEOX_elpt860: printenv diff --git a/board/LEOX/elpt860/flash.c b/board/LEOX/elpt860/flash.c index c1b3b85..668aee2 100644 --- a/board/LEOX/elpt860/flash.c +++ b/board/LEOX/elpt860/flash.c @@ -61,8 +61,8 @@ #include -#ifndef CFG_ENV_ADDR -# define CFG_ENV_ADDR (CFG_FLASH_BASE + CFG_ENV_OFFSET) +#ifndef CONFIG_ENV_ADDR +# define CONFIG_ENV_ADDR (CFG_FLASH_BASE + CONFIG_ENV_OFFSET) #endif flash_info_t flash_info[CFG_MAX_FLASH_BANKS]; /* info for FLASH chips */ @@ -122,11 +122,11 @@ flash_init (void) &flash_info[0]); #endif -#ifdef CFG_ENV_IS_IN_FLASH +#ifdef CONFIG_ENV_IS_IN_FLASH /* ENV protection ON by default */ flash_protect(FLAG_PROTECT_SET, - CFG_ENV_ADDR, - CFG_ENV_ADDR + CFG_ENV_SIZE-1, + CONFIG_ENV_ADDR, + CONFIG_ENV_ADDR + CONFIG_ENV_SIZE-1, &flash_info[0]); #endif diff --git a/board/LEOX/elpt860/u-boot.lds b/board/LEOX/elpt860/u-boot.lds index 7b1440b..40a611a 100644 --- a/board/LEOX/elpt860/u-boot.lds +++ b/board/LEOX/elpt860/u-boot.lds @@ -77,7 +77,7 @@ SECTIONS lib_ppc/ticks.o (.text) . = env_offset; - common/environment.o (.text) + common/env_embedded.o (.text) *(.text) *(.fixup) diff --git a/board/LEOX/elpt860/u-boot.lds.debug b/board/LEOX/elpt860/u-boot.lds.debug index 3578670..434c9b7 100644 --- a/board/LEOX/elpt860/u-boot.lds.debug +++ b/board/LEOX/elpt860/u-boot.lds.debug @@ -70,7 +70,7 @@ SECTIONS lib_generic/crc32.o (.text) . = env_offset; - common/environment.o (.text) + common/env_embedded.o (.text) *(.text) *(.fixup) diff --git a/board/MAI/AmigaOneG3SE/flash_new.c b/board/MAI/AmigaOneG3SE/flash_new.c index d46bf46..3efee7e 100644 --- a/board/MAI/AmigaOneG3SE/flash_new.c +++ b/board/MAI/AmigaOneG3SE/flash_new.c @@ -123,11 +123,11 @@ unsigned long flash_init (void) &flash_info[0]); #endif -#ifdef CFG_ENV_IS_IN_FLASH +#ifdef CONFIG_ENV_IS_IN_FLASH /* ENV protection ON by default */ flash_protect(FLAG_PROTECT_SET, - CFG_ENV_ADDR, - CFG_ENV_ADDR + CFG_ENV_SECT_SIZE - 1, + CONFIG_ENV_ADDR, + CONFIG_ENV_ADDR + CONFIG_ENV_SECT_SIZE - 1, &flash_info[0]); #endif diff --git a/board/MAI/AmigaOneG3SE/u-boot.lds b/board/MAI/AmigaOneG3SE/u-boot.lds index 7386ea7..e107b47 100644 --- a/board/MAI/AmigaOneG3SE/u-boot.lds +++ b/board/MAI/AmigaOneG3SE/u-boot.lds @@ -62,7 +62,7 @@ SECTIONS cpu/74xx_7xx/start.o (.text) /* store the environment in a seperate sector in the boot flash */ /* . = env_offset; */ - common/environment.o(.text) + common/env_embedded.o(.text) *(.text) *(.fixup) diff --git a/board/Marvell/common/bootseq.txt b/board/Marvell/common/bootseq.txt index 290aed9..e4fefb3 100644 --- a/board/Marvell/common/bootseq.txt +++ b/board/Marvell/common/bootseq.txt @@ -88,7 +88,7 @@ in_flash: nothing mem_malloc_init malloc_bin_reloc - spi_init (r or f)??? (CFG_ENV_IS_IN_EEPROM) + spi_init (r or f)??? (CONFIG_ENV_IS_IN_EEPROM) env_relocated misc_init_r(bd): (board/evb64260/evb64260.c) mpsc_init2 diff --git a/board/Marvell/db64360/u-boot.lds b/board/Marvell/db64360/u-boot.lds index 1a95755..b6b37ef 100644 --- a/board/Marvell/db64360/u-boot.lds +++ b/board/Marvell/db64360/u-boot.lds @@ -60,7 +60,7 @@ SECTIONS /* store the environment in a seperate sector in the boot flash */ /* . = env_offset; */ -/* common/environment.o(.text) */ +/* common/env_embedded.o(.text) */ *(.text) *(.fixup) diff --git a/board/Marvell/db64460/u-boot.lds b/board/Marvell/db64460/u-boot.lds index 1a95755..b6b37ef 100644 --- a/board/Marvell/db64460/u-boot.lds +++ b/board/Marvell/db64460/u-boot.lds @@ -60,7 +60,7 @@ SECTIONS /* store the environment in a seperate sector in the boot flash */ /* . = env_offset; */ -/* common/environment.o(.text) */ +/* common/env_embedded.o(.text) */ *(.text) *(.fixup) diff --git a/board/MigoR/u-boot.lds b/board/MigoR/u-boot.lds index 692bc62..f9c1eff 100644 --- a/board/MigoR/u-boot.lds +++ b/board/MigoR/u-boot.lds @@ -49,9 +49,9 @@ SECTIONS { cpu/sh4/start.o (.text) . = ALIGN(8192); - common/environment.o (.ppcenv) + common/env_embedded.o (.ppcenv) . = ALIGN(8192); - common/environment.o (.ppcenvr) + common/env_embedded.o (.ppcenvr) . = ALIGN(8192); *(.text) . = ALIGN(4); diff --git a/board/RPXClassic/u-boot.lds b/board/RPXClassic/u-boot.lds index 1f9a191..271ac76 100644 --- a/board/RPXClassic/u-boot.lds +++ b/board/RPXClassic/u-boot.lds @@ -64,7 +64,7 @@ SECTIONS /* XXX ? . = env_offset; */ - common/environment.o(.text) + common/env_embedded.o(.text) *(.text) *(.fixup) diff --git a/board/RPXClassic/u-boot.lds.debug b/board/RPXClassic/u-boot.lds.debug index c33581d..ea85389 100644 --- a/board/RPXClassic/u-boot.lds.debug +++ b/board/RPXClassic/u-boot.lds.debug @@ -61,7 +61,7 @@ SECTIONS lib_generic/crc32.o (.text) . = env_offset; - common/environment.o(.text) + common/env_embedded.o(.text) *(.text) *(.fixup) diff --git a/board/RPXlite/u-boot.lds b/board/RPXlite/u-boot.lds index 1f9a191..271ac76 100644 --- a/board/RPXlite/u-boot.lds +++ b/board/RPXlite/u-boot.lds @@ -64,7 +64,7 @@ SECTIONS /* XXX ? . = env_offset; */ - common/environment.o(.text) + common/env_embedded.o(.text) *(.text) *(.fixup) diff --git a/board/RPXlite/u-boot.lds.debug b/board/RPXlite/u-boot.lds.debug index c33581d..ea85389 100644 --- a/board/RPXlite/u-boot.lds.debug +++ b/board/RPXlite/u-boot.lds.debug @@ -61,7 +61,7 @@ SECTIONS lib_generic/crc32.o (.text) . = env_offset; - common/environment.o(.text) + common/env_embedded.o(.text) *(.text) *(.fixup) diff --git a/board/RPXlite_dw/README b/board/RPXlite_dw/README index 28bcb31..14296b2 100644 --- a/board/RPXlite_dw/README +++ b/board/RPXlite_dw/README @@ -21,7 +21,7 @@ make distclean make RPXlite_DW_64_config make all -2. CFG_ENV_IS_IN_FLASH/CFG_ENV_IS_IN_NVRAM +2. CONFIG_ENV_IS_IN_FLASH/CONFIG_ENV_IS_IN_NVRAM The default environment parameter is stored in FLASH because it is a common choice for environment parameter.So I make NVRAM as backup parameter storeage.The reason why I diff --git a/board/RPXlite_dw/u-boot.lds b/board/RPXlite_dw/u-boot.lds index 2ee1206..8ccffa2 100644 --- a/board/RPXlite_dw/u-boot.lds +++ b/board/RPXlite_dw/u-boot.lds @@ -64,7 +64,7 @@ SECTIONS /* XXX ? . = env_offset; */ - common/environment.o(.text) + common/env_embedded.o(.text) *(.text) *(.fixup) diff --git a/board/RPXlite_dw/u-boot.lds.debug b/board/RPXlite_dw/u-boot.lds.debug index f6d1537..0f6ae69 100644 --- a/board/RPXlite_dw/u-boot.lds.debug +++ b/board/RPXlite_dw/u-boot.lds.debug @@ -61,7 +61,7 @@ SECTIONS lib_generic/crc32.o (.text) . = env_offset; - common/environment.o(.text) + common/env_embedded.o(.text) *(.text) *(.fixup) diff --git a/board/RRvision/flash.c b/board/RRvision/flash.c index d8e07e6..6608bca 100644 --- a/board/RRvision/flash.c +++ b/board/RRvision/flash.c @@ -26,8 +26,8 @@ #include #include -#ifndef CFG_ENV_ADDR -#define CFG_ENV_ADDR (CFG_FLASH_BASE + CFG_ENV_OFFSET) +#ifndef CONFIG_ENV_ADDR +#define CONFIG_ENV_ADDR (CFG_FLASH_BASE + CONFIG_ENV_OFFSET) #endif flash_info_t flash_info[CFG_MAX_FLASH_BANKS]; /* info for FLASH chips */ @@ -77,11 +77,11 @@ unsigned long flash_init (void) &flash_info[0]); #endif -#ifdef CFG_ENV_IS_IN_FLASH +#ifdef CONFIG_ENV_IS_IN_FLASH /* ENV protection ON by default */ flash_protect(FLAG_PROTECT_SET, - CFG_ENV_ADDR, - CFG_ENV_ADDR+CFG_ENV_SIZE-1, + CONFIG_ENV_ADDR, + CONFIG_ENV_ADDR+CONFIG_ENV_SIZE-1, &flash_info[0]); #endif diff --git a/board/RRvision/u-boot.lds b/board/RRvision/u-boot.lds index 9e767ee..ce1148d 100644 --- a/board/RRvision/u-boot.lds +++ b/board/RRvision/u-boot.lds @@ -66,7 +66,7 @@ SECTIONS lib_ppc/time.o (.text) . = env_offset; - common/environment.o (.ppcenv) + common/env_embedded.o (.ppcenv) *(.text) *(.fixup) diff --git a/board/a3000/a3000.c b/board/a3000/a3000.c index 040ba89..1ba21ed 100644 --- a/board/a3000/a3000.c +++ b/board/a3000/a3000.c @@ -115,4 +115,3 @@ int board_eth_init(bd_t *bis) { return pci_eth_init(bis); } - diff --git a/board/a3000/flash.c b/board/a3000/flash.c index 13a5ca5..add2a28 100644 --- a/board/a3000/flash.c +++ b/board/a3000/flash.c @@ -25,15 +25,15 @@ #include #include -#if defined(CFG_ENV_IS_IN_FLASH) -# ifndef CFG_ENV_ADDR -# define CFG_ENV_ADDR (CFG_FLASH_BASE + CFG_ENV_OFFSET) +#if defined(CONFIG_ENV_IS_IN_FLASH) +# ifndef CONFIG_ENV_ADDR +# define CONFIG_ENV_ADDR (CFG_FLASH_BASE + CONFIG_ENV_OFFSET) # endif -# ifndef CFG_ENV_SIZE -# define CFG_ENV_SIZE CFG_ENV_SECT_SIZE +# ifndef CONFIG_ENV_SIZE +# define CONFIG_ENV_SIZE CONFIG_ENV_SECT_SIZE # endif -# ifndef CFG_ENV_SECT_SIZE -# define CFG_ENV_SECT_SIZE CFG_ENV_SIZE +# ifndef CONFIG_ENV_SECT_SIZE +# define CONFIG_ENV_SECT_SIZE CONFIG_ENV_SIZE # endif #endif @@ -108,12 +108,12 @@ unsigned long flash_init (void) &flash_info[0]); #endif -#ifdef CFG_ENV_IS_IN_FLASH +#ifdef CONFIG_ENV_IS_IN_FLASH /* ENV protection ON by default */ - DEBUGF("protect environtment %x @ %x\n", CFG_ENV_ADDR, CFG_ENV_SECT_SIZE); + DEBUGF("protect environtment %x @ %x\n", CONFIG_ENV_ADDR, CONFIG_ENV_SECT_SIZE); flash_protect(FLAG_PROTECT_SET, - CFG_ENV_ADDR, - CFG_ENV_ADDR+CFG_ENV_SECT_SIZE-1, + CONFIG_ENV_ADDR, + CONFIG_ENV_ADDR+CONFIG_ENV_SECT_SIZE-1, &flash_info[0]); #endif diff --git a/board/actux1/u-boot.lds b/board/actux1/u-boot.lds index 0de78d3..ae9b36c 100644 --- a/board/actux1/u-boot.lds +++ b/board/actux1/u-boot.lds @@ -37,7 +37,7 @@ SECTIONS common/dlmalloc.o(.text) cpu/ixp/cpu.o(.text) . = env_offset; - common/environment.o(.ppcenv) + common/env_embedded.o(.ppcenv) * (.text) } diff --git a/board/actux2/u-boot.lds b/board/actux2/u-boot.lds index 90cafce..d1f7a0a 100644 --- a/board/actux2/u-boot.lds +++ b/board/actux2/u-boot.lds @@ -38,7 +38,7 @@ SECTIONS cpu/ixp/cpu.o(.text) . = env_offset; - common/environment.o (.ppcenv) + common/env_embedded.o (.ppcenv) * (.text) } diff --git a/board/actux3/u-boot.lds b/board/actux3/u-boot.lds index b9a9eb9..114e5a8 100644 --- a/board/actux3/u-boot.lds +++ b/board/actux3/u-boot.lds @@ -38,7 +38,7 @@ SECTIONS cpu/ixp/cpu.o (.text) . = env_offset; - common/environment.o (.ppcenv) + common/env_embedded.o (.ppcenv) * (.text) } diff --git a/board/alaska/flash.c b/board/alaska/flash.c index 7156160..556c168 100644 --- a/board/alaska/flash.c +++ b/board/alaska/flash.c @@ -144,11 +144,11 @@ unsigned long flash_init (void) #endif flash_protect (FLAG_PROTECT_SET, - CFG_ENV1_ADDR, - CFG_ENV1_ADDR + CFG_ENV1_SIZE - 1, &flash_info[1]); + CONFIG_ENV1_ADDR, + CONFIG_ENV1_ADDR + CONFIG_ENV1_SIZE - 1, &flash_info[1]); flash_protect (FLAG_PROTECT_SET, - CFG_ENV_ADDR, - CFG_ENV_ADDR + CFG_ENV_SIZE - 1, &flash_info[3]); + CONFIG_ENV_ADDR, + CONFIG_ENV_ADDR + CONFIG_ENV_SIZE - 1, &flash_info[3]); return size; } diff --git a/board/amcc/acadia/u-boot-nand.lds b/board/amcc/acadia/u-boot-nand.lds index cbdc0b0..bfe2769 100644 --- a/board/amcc/acadia/u-boot-nand.lds +++ b/board/amcc/acadia/u-boot-nand.lds @@ -57,7 +57,7 @@ SECTIONS /* Align to next NAND block */ . = ALIGN(0x4000); - common/environment.o (.ppcenv) + common/env_embedded.o (.ppcenv) /* Keep some space here for redundant env and potential bad env blocks */ . = ALIGN(0x10000); diff --git a/board/amcc/bamboo/flash.c b/board/amcc/bamboo/flash.c index 8a2e832..d004ed7 100644 --- a/board/amcc/bamboo/flash.c +++ b/board/amcc/bamboo/flash.c @@ -153,13 +153,13 @@ unsigned long flash_init(void) (void)flash_protect(FLAG_PROTECT_SET, CFG_MONITOR_BASE, CFG_MONITOR_BASE + CFG_MONITOR_LEN - 1, &flash_info[i]); -#if defined(CFG_ENV_IS_IN_FLASH) - (void)flash_protect(FLAG_PROTECT_SET, CFG_ENV_ADDR, - CFG_ENV_ADDR + CFG_ENV_SECT_SIZE - 1, +#if defined(CONFIG_ENV_IS_IN_FLASH) + (void)flash_protect(FLAG_PROTECT_SET, CONFIG_ENV_ADDR, + CONFIG_ENV_ADDR + CONFIG_ENV_SECT_SIZE - 1, &flash_info[i]); -#if defined(CFG_ENV_IS_IN_FLASH) && defined(CFG_ENV_ADDR_REDUND) - (void)flash_protect(FLAG_PROTECT_SET, CFG_ENV_ADDR_REDUND, - CFG_ENV_ADDR_REDUND + CFG_ENV_SECT_SIZE - 1, +#if defined(CONFIG_ENV_IS_IN_FLASH) && defined(CONFIG_ENV_ADDR_REDUND) + (void)flash_protect(FLAG_PROTECT_SET, CONFIG_ENV_ADDR_REDUND, + CONFIG_ENV_ADDR_REDUND + CONFIG_ENV_SECT_SIZE - 1, &flash_info[i]); #endif #endif diff --git a/board/amcc/bamboo/u-boot-nand.lds b/board/amcc/bamboo/u-boot-nand.lds index cbdc0b0..bfe2769 100644 --- a/board/amcc/bamboo/u-boot-nand.lds +++ b/board/amcc/bamboo/u-boot-nand.lds @@ -57,7 +57,7 @@ SECTIONS /* Align to next NAND block */ . = ALIGN(0x4000); - common/environment.o (.ppcenv) + common/env_embedded.o (.ppcenv) /* Keep some space here for redundant env and potential bad env blocks */ . = ALIGN(0x10000); diff --git a/board/amcc/bubinga/flash.c b/board/amcc/bubinga/flash.c index e4832eb..d71cc29 100644 --- a/board/amcc/bubinga/flash.c +++ b/board/amcc/bubinga/flash.c @@ -84,12 +84,12 @@ unsigned long flash_init(void) CFG_MONITOR_BASE, CFG_MONITOR_BASE + CFG_MONITOR_LEN - 1, &flash_info[0]); -#ifdef CFG_ENV_IS_IN_FLASH - (void)flash_protect(FLAG_PROTECT_SET, CFG_ENV_ADDR, - CFG_ENV_ADDR + CFG_ENV_SECT_SIZE - 1, +#ifdef CONFIG_ENV_IS_IN_FLASH + (void)flash_protect(FLAG_PROTECT_SET, CONFIG_ENV_ADDR, + CONFIG_ENV_ADDR + CONFIG_ENV_SECT_SIZE - 1, &flash_info[0]); - (void)flash_protect(FLAG_PROTECT_SET, CFG_ENV_ADDR_REDUND, - CFG_ENV_ADDR_REDUND + CFG_ENV_SECT_SIZE - 1, + (void)flash_protect(FLAG_PROTECT_SET, CONFIG_ENV_ADDR_REDUND, + CONFIG_ENV_ADDR_REDUND + CONFIG_ENV_SECT_SIZE - 1, &flash_info[0]); #endif diff --git a/board/amcc/canyonlands/canyonlands.c b/board/amcc/canyonlands/canyonlands.c index e9eba49..47667ee 100644 --- a/board/amcc/canyonlands/canyonlands.c +++ b/board/amcc/canyonlands/canyonlands.c @@ -460,12 +460,8 @@ void ft_board_setup(void *blob, bd_t *bd) * node in the device tree, so that Linux doesn't initialize * it. */ - rc = fdt_find_and_setprop(blob, "/plb/pciex@d00000000", "status", - "disabled", sizeof("disabled"), 1); - if (rc) { - printf("Unable to update property status in PCIe node, err=%s\n", - fdt_strerror(rc)); - } + fdt_find_and_setprop(blob, "/plb/pciex@d00000000", "status", + "disabled", sizeof("disabled"), 1); } if (gd->board_type == BOARD_CANYONLANDS_PCIE) { @@ -474,12 +470,8 @@ void ft_board_setup(void *blob, bd_t *bd) * node in the device tree, so that Linux doesn't initialize * it. */ - rc = fdt_find_and_setprop(blob, "/plb/sata@bffd1000", "status", - "disabled", sizeof("disabled"), 1); - if (rc) { - printf("Unable to update property status in PCIe node, err=%s\n", - fdt_strerror(rc)); - } + fdt_find_and_setprop(blob, "/plb/sata@bffd1000", "status", + "disabled", sizeof("disabled"), 1); } } #endif /* defined(CONFIG_OF_LIBFDT) && defined(CONFIG_OF_BOARD_SETUP) */ diff --git a/board/amcc/canyonlands/u-boot-nand.lds b/board/amcc/canyonlands/u-boot-nand.lds index 8a4b7f5..6e871cf 100644 --- a/board/amcc/canyonlands/u-boot-nand.lds +++ b/board/amcc/canyonlands/u-boot-nand.lds @@ -57,7 +57,7 @@ SECTIONS /* Align to next NAND block */ . = ALIGN(0x20000); - common/environment.o (.ppcenv) + common/env_embedded.o (.ppcenv) /* Keep some space here for redundant env and potential bad env blocks */ . = ALIGN(0x80000); diff --git a/board/amcc/ebony/flash.c b/board/amcc/ebony/flash.c index e8fbbc4..d9c6974 100644 --- a/board/amcc/ebony/flash.c +++ b/board/amcc/ebony/flash.c @@ -124,12 +124,12 @@ unsigned long flash_init(void) (void)flash_protect(FLAG_PROTECT_SET, CFG_MONITOR_BASE, CFG_MONITOR_BASE + CFG_MONITOR_LEN - 1, &flash_info[2]); -#ifdef CFG_ENV_IS_IN_FLASH - (void)flash_protect(FLAG_PROTECT_SET, CFG_ENV_ADDR, - CFG_ENV_ADDR + CFG_ENV_SECT_SIZE - 1, +#ifdef CONFIG_ENV_IS_IN_FLASH + (void)flash_protect(FLAG_PROTECT_SET, CONFIG_ENV_ADDR, + CONFIG_ENV_ADDR + CONFIG_ENV_SECT_SIZE - 1, &flash_info[2]); - (void)flash_protect(FLAG_PROTECT_SET, CFG_ENV_ADDR_REDUND, - CFG_ENV_ADDR_REDUND + CFG_ENV_SECT_SIZE - 1, + (void)flash_protect(FLAG_PROTECT_SET, CONFIG_ENV_ADDR_REDUND, + CONFIG_ENV_ADDR_REDUND + CONFIG_ENV_SECT_SIZE - 1, &flash_info[2]); #endif diff --git a/board/amcc/kilauea/kilauea.c b/board/amcc/kilauea/kilauea.c index 7b10255..f407e19 100644 --- a/board/amcc/kilauea/kilauea.c +++ b/board/amcc/kilauea/kilauea.c @@ -219,7 +219,7 @@ int board_early_init_f (void) int misc_init_r(void) { -#ifdef CFG_ENV_IS_IN_FLASH +#ifdef CONFIG_ENV_IS_IN_FLASH /* Monitor protection ON by default */ flash_protect(FLAG_PROTECT_SET, -CFG_MONITOR_LEN, diff --git a/board/amcc/kilauea/u-boot-nand.lds b/board/amcc/kilauea/u-boot-nand.lds index cbdc0b0..bfe2769 100644 --- a/board/amcc/kilauea/u-boot-nand.lds +++ b/board/amcc/kilauea/u-boot-nand.lds @@ -57,7 +57,7 @@ SECTIONS /* Align to next NAND block */ . = ALIGN(0x4000); - common/environment.o (.ppcenv) + common/env_embedded.o (.ppcenv) /* Keep some space here for redundant env and potential bad env blocks */ . = ALIGN(0x10000); diff --git a/board/amcc/luan/flash.c b/board/amcc/luan/flash.c index d3c3c0d..d28bf9d 100644 --- a/board/amcc/luan/flash.c +++ b/board/amcc/luan/flash.c @@ -95,12 +95,12 @@ unsigned long flash_init(void) (void)flash_protect(FLAG_PROTECT_SET, CFG_MONITOR_BASE, CFG_MONITOR_BASE + CFG_MONITOR_LEN - 1, &flash_info[2]); -#ifdef CFG_ENV_IS_IN_FLASH - (void)flash_protect(FLAG_PROTECT_SET, CFG_ENV_ADDR, - CFG_ENV_ADDR + CFG_ENV_SECT_SIZE - 1, +#ifdef CONFIG_ENV_IS_IN_FLASH + (void)flash_protect(FLAG_PROTECT_SET, CONFIG_ENV_ADDR, + CONFIG_ENV_ADDR + CONFIG_ENV_SECT_SIZE - 1, &flash_info[2]); - (void)flash_protect(FLAG_PROTECT_SET, CFG_ENV_ADDR_REDUND, - CFG_ENV_ADDR_REDUND + CFG_ENV_SECT_SIZE - 1, + (void)flash_protect(FLAG_PROTECT_SET, CONFIG_ENV_ADDR_REDUND, + CONFIG_ENV_ADDR_REDUND + CONFIG_ENV_SECT_SIZE - 1, &flash_info[2]); #endif diff --git a/board/amcc/makalu/makalu.c b/board/amcc/makalu/makalu.c index 2b4d3d4..fc79907 100644 --- a/board/amcc/makalu/makalu.c +++ b/board/amcc/makalu/makalu.c @@ -210,7 +210,7 @@ int board_early_init_f (void) int misc_init_r(void) { -#ifdef CFG_ENV_IS_IN_FLASH +#ifdef CONFIG_ENV_IS_IN_FLASH /* Monitor protection ON by default */ flash_protect(FLAG_PROTECT_SET, -CFG_MONITOR_LEN, diff --git a/board/amcc/ocotea/flash.c b/board/amcc/ocotea/flash.c index 5614e20..46c6946 100644 --- a/board/amcc/ocotea/flash.c +++ b/board/amcc/ocotea/flash.c @@ -134,12 +134,12 @@ unsigned long flash_init(void) (void)flash_protect(FLAG_PROTECT_SET, CFG_MONITOR_BASE, CFG_MONITOR_BASE + CFG_MONITOR_LEN - 1, &flash_info[i]); -#ifdef CFG_ENV_IS_IN_FLASH - (void)flash_protect(FLAG_PROTECT_SET, CFG_ENV_ADDR, - CFG_ENV_ADDR + CFG_ENV_SECT_SIZE - 1, +#ifdef CONFIG_ENV_IS_IN_FLASH + (void)flash_protect(FLAG_PROTECT_SET, CONFIG_ENV_ADDR, + CONFIG_ENV_ADDR + CONFIG_ENV_SECT_SIZE - 1, &flash_info[i]); - (void)flash_protect(FLAG_PROTECT_SET, CFG_ENV_ADDR_REDUND, - CFG_ENV_ADDR_REDUND + CFG_ENV_SECT_SIZE - 1, + (void)flash_protect(FLAG_PROTECT_SET, CONFIG_ENV_ADDR_REDUND, + CONFIG_ENV_ADDR_REDUND + CONFIG_ENV_SECT_SIZE - 1, &flash_info[i]); #endif diff --git a/board/amcc/redwood/u-boot.lds b/board/amcc/redwood/u-boot.lds index 2104cc2..8091dac 100644 --- a/board/amcc/redwood/u-boot.lds +++ b/board/amcc/redwood/u-boot.lds @@ -70,7 +70,7 @@ SECTIONS board/amcc/redwood/init.o (.text) /* . = env_offset;*/ -/* common/environment.o(.text)*/ +/* common/env_embedded.o(.text)*/ *(.text) *(.fixup) diff --git a/board/amcc/sequoia/sequoia.c b/board/amcc/sequoia/sequoia.c index 176d5cf..e439fb9 100644 --- a/board/amcc/sequoia/sequoia.c +++ b/board/amcc/sequoia/sequoia.c @@ -157,7 +157,7 @@ int misc_init_r(void) */ flash_get_size(gd->bd->bi_flashstart, 0); -#ifdef CFG_ENV_IS_IN_FLASH +#ifdef CONFIG_ENV_IS_IN_FLASH /* Monitor protection ON by default */ (void)flash_protect(FLAG_PROTECT_SET, -CFG_MONITOR_LEN, @@ -166,8 +166,8 @@ int misc_init_r(void) /* Env protection ON by default */ (void)flash_protect(FLAG_PROTECT_SET, - CFG_ENV_ADDR_REDUND, - CFG_ENV_ADDR_REDUND + 2*CFG_ENV_SECT_SIZE - 1, + CONFIG_ENV_ADDR_REDUND, + CONFIG_ENV_ADDR_REDUND + 2*CONFIG_ENV_SECT_SIZE - 1, &flash_info[0]); #endif diff --git a/board/amcc/sequoia/u-boot-nand.lds b/board/amcc/sequoia/u-boot-nand.lds index ae2e18d..6608e65 100644 --- a/board/amcc/sequoia/u-boot-nand.lds +++ b/board/amcc/sequoia/u-boot-nand.lds @@ -57,7 +57,7 @@ SECTIONS /* Align to next NAND block */ . = ALIGN(0x4000); - common/environment.o (.ppcenv) + common/env_embedded.o (.ppcenv) /* Keep some space here for redundant env and potential bad env blocks */ . = ALIGN(0x10000); diff --git a/board/amcc/taihu/flash.c b/board/amcc/taihu/flash.c index 290259e..ae92bb2 100644 --- a/board/amcc/taihu/flash.c +++ b/board/amcc/taihu/flash.c @@ -87,12 +87,12 @@ unsigned long flash_init(void) CFG_MONITOR_BASE, CFG_MONITOR_BASE + CFG_MONITOR_LEN - 1, &flash_info[0]); -#ifdef CFG_ENV_IS_IN_FLASH - (void)flash_protect(FLAG_PROTECT_SET, CFG_ENV_ADDR, - CFG_ENV_ADDR + CFG_ENV_SECT_SIZE - 1, +#ifdef CONFIG_ENV_IS_IN_FLASH + (void)flash_protect(FLAG_PROTECT_SET, CONFIG_ENV_ADDR, + CONFIG_ENV_ADDR + CONFIG_ENV_SECT_SIZE - 1, &flash_info[0]); - (void)flash_protect(FLAG_PROTECT_SET, CFG_ENV_ADDR_REDUND, - CFG_ENV_ADDR_REDUND + CFG_ENV_SECT_SIZE - 1, + (void)flash_protect(FLAG_PROTECT_SET, CONFIG_ENV_ADDR_REDUND, + CONFIG_ENV_ADDR_REDUND + CONFIG_ENV_SECT_SIZE - 1, &flash_info[0]); #endif /* Also protect sector containing initial power-up instruction */ diff --git a/board/amcc/taihu/taihu.c b/board/amcc/taihu/taihu.c index 266f260..ee0939a 100644 --- a/board/amcc/taihu/taihu.c +++ b/board/amcc/taihu/taihu.c @@ -78,15 +78,6 @@ int checkboard(void) return 0; } -/************************************************************************* - * phys_size_t initdram - * - ************************************************************************/ -phys_size_t initdram(int board) -{ - return CFG_SDRAM_SIZE_PER_BANK * CFG_SDRAM_BANKS; /* 128Mbytes */ -} - static int do_sw_stat(cmd_tbl_t* cmd_tp, int flags, int argc, char *argv[]) { char stat; diff --git a/board/amcc/walnut/flash.c b/board/amcc/walnut/flash.c index 056f9b9..fe6ca6c 100644 --- a/board/amcc/walnut/flash.c +++ b/board/amcc/walnut/flash.c @@ -82,12 +82,12 @@ unsigned long flash_init(void) CFG_MONITOR_BASE, CFG_MONITOR_BASE + CFG_MONITOR_LEN - 1, &flash_info[0]); -#ifdef CFG_ENV_IS_IN_FLASH - (void)flash_protect(FLAG_PROTECT_SET, CFG_ENV_ADDR, - CFG_ENV_ADDR + CFG_ENV_SECT_SIZE - 1, +#ifdef CONFIG_ENV_IS_IN_FLASH + (void)flash_protect(FLAG_PROTECT_SET, CONFIG_ENV_ADDR, + CONFIG_ENV_ADDR + CONFIG_ENV_SECT_SIZE - 1, &flash_info[0]); - (void)flash_protect(FLAG_PROTECT_SET, CFG_ENV_ADDR_REDUND, - CFG_ENV_ADDR_REDUND + CFG_ENV_SECT_SIZE - 1, + (void)flash_protect(FLAG_PROTECT_SET, CONFIG_ENV_ADDR_REDUND, + CONFIG_ENV_ADDR_REDUND + CONFIG_ENV_SECT_SIZE - 1, &flash_info[0]); #endif diff --git a/board/amcc/yucca/cmd_yucca.c b/board/amcc/yucca/cmd_yucca.c index e698b20..bd42c5d 100644 --- a/board/amcc/yucca/cmd_yucca.c +++ b/board/amcc/yucca/cmd_yucca.c @@ -33,8 +33,6 @@ extern void print_evb440spe_info(void); static int setBootStrapClock(cmd_tbl_t *cmdtp, int incrflag, int flag, int argc, char *argv[]); -extern int cmd_get_data_size(char* arg, int default_size); - /* ------------------------------------------------------------------------- */ int do_evb440spe(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) { diff --git a/board/amcc/yucca/flash.c b/board/amcc/yucca/flash.c index 15b8a46..c405346 100644 --- a/board/amcc/yucca/flash.c +++ b/board/amcc/yucca/flash.c @@ -1037,13 +1037,13 @@ unsigned long flash_init(void) (void)flash_protect(FLAG_PROTECT_SET, CFG_MONITOR_BASE, CFG_MONITOR_BASE + CFG_MONITOR_LEN - 1, &flash_info[i]); -#if defined(CFG_ENV_IS_IN_FLASH) - (void)flash_protect(FLAG_PROTECT_SET, CFG_ENV_ADDR, - CFG_ENV_ADDR + CFG_ENV_SECT_SIZE - 1, +#if defined(CONFIG_ENV_IS_IN_FLASH) + (void)flash_protect(FLAG_PROTECT_SET, CONFIG_ENV_ADDR, + CONFIG_ENV_ADDR + CONFIG_ENV_SECT_SIZE - 1, &flash_info[i]); -#if defined(CFG_ENV_ADDR_REDUND) - (void)flash_protect(FLAG_PROTECT_SET, CFG_ENV_ADDR_REDUND, - CFG_ENV_ADDR_REDUND + CFG_ENV_SECT_SIZE - 1, +#if defined(CONFIG_ENV_ADDR_REDUND) + (void)flash_protect(FLAG_PROTECT_SET, CONFIG_ENV_ADDR_REDUND, + CONFIG_ENV_ADDR_REDUND + CONFIG_ENV_SECT_SIZE - 1, &flash_info[i]); #endif #endif diff --git a/board/amirix/ap1000/ap1000.c b/board/amirix/ap1000/ap1000.c index 8f30ed9..e9f80ff 100644 --- a/board/amirix/ap1000/ap1000.c +++ b/board/amirix/ap1000/ap1000.c @@ -703,4 +703,3 @@ int board_eth_init(bd_t *bis) { return pci_eth_init(bis); } - diff --git a/board/amirix/ap1000/u-boot.lds b/board/amirix/ap1000/u-boot.lds index a939e03..f5a5616 100644 --- a/board/amirix/ap1000/u-boot.lds +++ b/board/amirix/ap1000/u-boot.lds @@ -69,7 +69,7 @@ SECTIONS lib_generic/zlib.o (.text) /* . = env_offset;*/ -/* common/environment.o(.text)*/ +/* common/env_embedded.o(.text)*/ *(.text) *(.fixup) diff --git a/board/ap325rxa/u-boot.lds b/board/ap325rxa/u-boot.lds index a670374..e9f8dc0 100644 --- a/board/ap325rxa/u-boot.lds +++ b/board/ap325rxa/u-boot.lds @@ -49,9 +49,9 @@ SECTIONS { cpu/sh4/start.o (.text) . = ALIGN(8192); - common/environment.o (.ppcenv) + common/env_embedded.o (.ppcenv) . = ALIGN(8192); - common/environment.o (.ppcenvr) + common/env_embedded.o (.ppcenvr) . = ALIGN(8192); *(.text) . = ALIGN(4); @@ -103,4 +103,3 @@ SECTIONS PROVIDE (_end = .); } - diff --git a/board/armadillo/flash.c b/board/armadillo/flash.c index 8518856..6ed88f4 100644 --- a/board/armadillo/flash.c +++ b/board/armadillo/flash.c @@ -74,8 +74,8 @@ ulong flash_init (void) &flash_info[0]); flash_protect (FLAG_PROTECT_SET, - CFG_ENV_ADDR, - CFG_ENV_ADDR + CFG_ENV_SIZE - 1, &flash_info[0]); + CONFIG_ENV_ADDR, + CONFIG_ENV_ADDR + CONFIG_ENV_SIZE - 1, &flash_info[0]); return size; } diff --git a/board/atc/flash.c b/board/atc/flash.c index 2ab60e8..7835e8f 100644 --- a/board/atc/flash.c +++ b/board/atc/flash.c @@ -95,12 +95,12 @@ unsigned long flash_init (void) flash_get_info(CFG_MONITOR_BASE)); #endif -#ifdef CFG_ENV_IS_IN_FLASH +#ifdef CONFIG_ENV_IS_IN_FLASH /* ENV protection ON by default */ flash_protect(FLAG_PROTECT_SET, - CFG_ENV_ADDR, - CFG_ENV_ADDR+CFG_ENV_SIZE-1, - flash_get_info(CFG_ENV_ADDR)); + CONFIG_ENV_ADDR, + CONFIG_ENV_ADDR+CONFIG_ENV_SIZE-1, + flash_get_info(CONFIG_ENV_ADDR)); #endif diff --git a/board/atmel/at91cap9adk/at91cap9adk.c b/board/atmel/at91cap9adk/at91cap9adk.c index 787d64d..8dbe841 100644 --- a/board/atmel/at91cap9adk/at91cap9adk.c +++ b/board/atmel/at91cap9adk/at91cap9adk.c @@ -326,6 +326,35 @@ static void at91cap9_lcd_hw_init(void) gd->fb_base = 0; } + +#ifdef CONFIG_LCD_INFO +#include +#include + +void lcd_show_board_info(void) +{ + ulong dram_size, nand_size; + int i; + char temp[32]; + + lcd_printf ("%s\n", U_BOOT_VERSION); + lcd_printf ("(C) 2008 ATMEL Corp\n"); + lcd_printf ("at91support@atmel.com\n"); + lcd_printf ("%s CPU at %s MHz\n", + AT91_CPU_NAME, +