[U-Boot] [PULL] U-Boot-pxa pull request
Hi, please pull my git://git.denx.de/u-boot-pxa for-wd-testing branch into your u- boot-testing/Makefile-cleanup branch. Thanks
The following changes since commit a5cb985d8006bd1bb6d188b84f435f5d007fd6ac:
Makefile: move all Power Architecture boards into boards.cfg (2010-10-17 01:34:08 +0200)
are available in the git repository at: git://git.denx.de/u-boot-pxa.git for-wd-testing
Marek Vasut (19): PXA: pxafb: Fix indent problems PXA: pxa-regs.h cleanup PXA: pxafb: Add ACX517AKN support PXA: pxafb: Add support for Sharp LQ038J7DH53 PXA: pxafb: Marvell Littleton LCD definition common: Enable serial for PXA250 PXA: Palm Tungsten|C Support PXA: Add initial Palm LifeDrive support PXA: Voipac270 improvements PXA: Balloon3 board support PXA: Add missing MAINTAINERS entries PXA: Add necessary information for RELOC PXA: Fix reloc, Push lowlevel init into C code PXA: Fix vpac270 for Reloc PXA: Fix ZipitZ2 for Reloc PXA: Fix Balloon3 for Reloc PXA: Fix vpac270 OneNAND booter Build: PXA: Fix Vpac270 build variants Build: PXA: Fix TrizepsIV build variants
Mikhail Kshevetskiy (4): PXA: remove unused u-boot.lds from board/vpac270 PXA: cleanup vpac270 config and set CONFIG_SYS_HZ to 1000 PXA: fix environment sector size, kernel and environment location for vpac270 PXA: fix MDREFR[APD] bit setting
MAINTAINERS | 9 + MAKEALL | 7 +- Makefile | 17 - arch/arm/cpu/pxa/cpu.c | 255 +++- arch/arm/cpu/pxa/i2c.c | 69 +- arch/arm/cpu/pxa/pxafb.c | 365 +++-- arch/arm/cpu/pxa/start.S | 346 ++--- arch/arm/cpu/pxa/timer.c | 7 +- arch/arm/cpu/pxa/usb.c | 61 +- arch/arm/include/asm/arch-pxa/hardware.h | 61 +- arch/arm/include/asm/arch-pxa/macro.h | 20 +- arch/arm/include/asm/arch-pxa/pxa-regs.h | 2688 +++++++++++++++-------------- board/balloon3/Makefile | 47 + board/balloon3/balloon3.c | 238 +++ board/colibri_pxa270/colibri_pxa270.c | 33 +- board/cradle/cradle.c | 5 +- board/cradle/lowlevel_init.S | 4 +- board/csb226/csb226.c | 13 +- board/delta/delta.c | 37 +- board/delta/nand.c | 110 +- board/innokom/innokom.c | 14 +- board/palmld/Makefile | 49 + board/palmld/config.mk | 1 + board/{zipitz2 => palmld}/lowlevel_init.S | 9 +- board/palmld/palmld.c | 69 + board/{vpac270 => palmld}/u-boot.lds | 7 +- board/palmtc/Makefile | 49 + board/palmtc/config.mk | 1 + board/{vpac270 => palmtc}/lowlevel_init.S | 3 +- board/palmtc/palmtc.c | 59 + board/{vpac270 => palmtc}/u-boot.lds | 7 +- board/pxa255_idp/pxa_idp.c | 27 +- board/trizepsiv/conxs.c | 35 +- board/vpac270/Makefile | 17 +- board/vpac270/config.mk | 1 - board/vpac270/vpac270.c | 92 +- board/wepep250/wepep250.c | 11 +- board/zipitz2/Makefile | 10 +- board/zipitz2/config.mk | 1 - board/zipitz2/zipitz2.c | 57 +- board/zylonite/nand.c | 110 +- boards.cfg | 8 + common/serial.c | 2 +- drivers/mmc/pxa_mmc.c | 98 +- drivers/serial/serial_pxa.c | 94 +- include/configs/balloon3.h | 274 +++ include/configs/cerf250.h | 3 + include/configs/colibri_pxa270.h | 3 + include/configs/cradle.h | 5 +- include/configs/csb226.h | 3 + include/configs/delta.h | 4 + include/configs/innokom.h | 3 + include/configs/lubbock.h | 3 + include/configs/palmld.h | 276 +++ include/configs/palmtc.h | 248 +++ include/configs/pleb2.h | 3 + include/configs/pxa255_idp.h | 3 + include/configs/trizepsiv.h | 3 + include/configs/vpac270.h | 138 +- include/configs/wepep250.h | 4 + include/configs/xaeniax.h | 3 + include/configs/xm250.h | 3 + include/configs/xsengine.h | 3 + include/configs/zipitz2.h | 10 +- include/configs/zylonite.h | 3 + onenand_ipl/board/vpac270/Makefile | 5 +- 66 files changed, 4017 insertions(+), 2206 deletions(-) create mode 100644 board/balloon3/Makefile create mode 100644 board/balloon3/balloon3.c create mode 100644 board/palmld/Makefile create mode 100644 board/palmld/config.mk rename board/{zipitz2 => palmld}/lowlevel_init.S (90%) create mode 100644 board/palmld/palmld.c copy board/{vpac270 => palmld}/u-boot.lds (90%) create mode 100644 board/palmtc/Makefile create mode 100644 board/palmtc/config.mk rename board/{vpac270 => palmtc}/lowlevel_init.S (95%) create mode 100644 board/palmtc/palmtc.c rename board/{vpac270 => palmtc}/u-boot.lds (90%) delete mode 100644 board/vpac270/config.mk delete mode 100644 board/zipitz2/config.mk create mode 100644 include/configs/balloon3.h create mode 100644 include/configs/palmld.h create mode 100644 include/configs/palmtc.h
Dear Marek Vasut,
In message 201010192228.34814.marek.vasut@gmail.com you wrote:
Hi, please pull my git://git.denx.de/u-boot-pxa for-wd-testing branch into your u- boot-testing/Makefile-cleanup branch. Thanks
The following changes since commit a5cb985d8006bd1bb6d188b84f435f5d007fd6ac:
Makefile: move all Power Architecture boards into boards.cfg (2010-10-17 01:34:08 +0200)
are available in the git repository at: git://git.denx.de/u-boot-pxa.git for-wd-testing
I send you the result of the pull off list.
You really need to reabse your tree:
-> cd u-boot-arm/ -> git remote update ... -> git pull u-boot-pxa.git for-wd-testing
From git://git.denx.de/u-boot-pxa
* branch for-wd-testing -> FETCH_HEAD CONFLICT (rename/rename): Rename "board/LEOX/elpt860/config.mk"->"board/ttcontrol/vision2/Makefile" in branch "HEAD" rename "board/LEOX/elpt860/config.mk"->"board/balloon3/Makefile" in "8e3615e158283ff8463710aff12747dc60bb1a07" CONFLICT (rename/delete): Rename board/Marvell/db64360/config.mk->board/isee/igep0030/config.mk in HEAD and deleted in 8e3615e158283ff8463710aff12747dc60bb1a07 CONFLICT (rename/delete): Rename board/RPXlite_dw/config.mk->board/ttcontrol/vision2/config.mk in HEAD and deleted in 8e3615e158283ff8463710aff12747dc60bb1a07 CONFLICT (rename/delete): Rename board/a3000/config.mk->board/palmtc/Makefile in 8e3615e158283ff8463710aff12747dc60bb1a07 and deleted in HEAD CONFLICT (rename/delete): Rename board/amcc/makalu/config.mk->board/armltd/vexpress/config.mk in HEAD and deleted in 8e3615e158283ff8463710aff12747dc60bb1a07 Renaming board/fads/config.mk => board/armltd/vexpress/Makefile Auto-merging board/armltd/vexpress/Makefile CONFLICT (rename/modify): Merge conflict in board/armltd/vexpress/Makefile Renaming board/galaxy5200/config.mk => board/isee/igep0030/Makefile Auto-merging board/isee/igep0030/Makefile CONFLICT (rename/modify): Merge conflict in board/isee/igep0030/Makefile CONFLICT (rename/rename): Rename "board/logodl/Makefile"->"board/a4m072/Makefile" in branch "HEAD" rename "board/logodl/Makefile"->"board/palmld/Makefile" in "8e3615e158283ff8463710aff12747dc60bb1a07" Renaming board/matrix_vision/mvbc_p/config.mk => board/a4m072/config.mk Auto-merging board/a4m072/config.mk CONFLICT (rename/modify): Merge conflict in board/a4m072/config.mk CONFLICT (rename/delete): Rename board/pdm360ng/config.mk->board/isee/igep0020/config.mk in HEAD and deleted in 8e3615e158283ff8463710aff12747dc60bb1a07 CONFLICT (rename/delete): Rename board/siemens/IAD210/config.mk->board/isee/igep0020/Makefile in HEAD and deleted in 8e3615e158283ff8463710aff12747dc60bb1a07 Auto-merging MAINTAINERS Auto-merging MAKEALL Auto-merging Makefile Auto-merging README Auto-merging arch/arm/cpu/arm1136/start.S CONFLICT (content): Merge conflict in arch/arm/cpu/arm1136/start.S Auto-merging arch/arm/cpu/arm1176/start.S Auto-merging arch/arm/cpu/arm720t/start.S Auto-merging arch/arm/cpu/arm920t/start.S Auto-merging arch/arm/cpu/arm925t/start.S Auto-merging arch/arm/cpu/arm926ejs/start.S CONFLICT (content): Merge conflict in arch/arm/cpu/arm926ejs/start.S Auto-merging arch/arm/cpu/arm946es/start.S Auto-merging arch/arm/cpu/arm_intcm/start.S Auto-merging arch/arm/cpu/armv7/start.S Auto-merging arch/arm/cpu/ixp/start.S Auto-merging arch/arm/cpu/lh7a40x/start.S Auto-merging arch/arm/cpu/pxa/start.S CONFLICT (content): Merge conflict in arch/arm/cpu/pxa/start.S Auto-merging arch/arm/cpu/s3c44b0/start.S Auto-merging arch/arm/cpu/sa1100/start.S Auto-merging arch/microblaze/cpu/start.S Auto-merging arch/microblaze/lib/board.c Auto-merging arch/powerpc/cpu/mpc85xx/start.S Auto-merging arch/powerpc/cpu/mpc86xx/start.S Auto-merging arch/powerpc/lib/board.c Auto-merging board/LaCie/edminiv2/config.mk CONFLICT (content): Merge conflict in board/LaCie/edminiv2/config.mk CONFLICT (delete/modify): board/alaska/config.mk deleted in HEAD and modified in 8e3615e158283ff8463710aff12747dc60bb1a07. Version 8e3615e158283ff8463710aff12747dc60bb1a07 of board/alaska/config.mk left in tree. Auto-merging board/atmel/at91rm9200ek/config.mk CONFLICT (content): Merge conflict in board/atmel/at91rm9200ek/config.mk CONFLICT (delete/modify): board/bc3450/config.mk deleted in HEAD and modified in 8e3615e158283ff8463710aff12747dc60bb1a07. Version 8e3615e158283ff8463710aff12747dc60bb1a07 of board/bc3450/config.mk left in tree. CONFLICT (delete/modify): board/canmb/config.mk deleted in HEAD and modified in 8e3615e158283ff8463710aff12747dc60bb1a07. Version 8e3615e158283ff8463710aff12747dc60bb1a07 of board/canmb/config.mk left in tree. CONFLICT (delete/modify): board/cm5200/config.mk deleted in HEAD and modified in 8e3615e158283ff8463710aff12747dc60bb1a07. Version 8e3615e158283ff8463710aff12747dc60bb1a07 of board/cm5200/config.mk left in tree. CONFLICT (delete/modify): board/digsy_mtc/config.mk deleted in HEAD and modified in 8e3615e158283ff8463710aff12747dc60bb1a07. Version 8e3615e158283ff8463710aff12747dc60bb1a07 of board/digsy_mtc/config.mk left in tree. CONFLICT (delete/modify): board/emk/top5200/config.mk deleted in HEAD and modified in 8e3615e158283ff8463710aff12747dc60bb1a07. Version 8e3615e158283ff8463710aff12747dc60bb1a07 of board/emk/top5200/config.mk left in tree. CONFLICT (delete/modify): board/esd/cpci5200/config.mk deleted in HEAD and modified in 8e3615e158283ff8463710aff12747dc60bb1a07. Version 8e3615e158283ff8463710aff12747dc60bb1a07 of board/esd/cpci5200/config.mk left in tree. CONFLICT (delete/modify): board/esd/mecp5200/config.mk deleted in HEAD and modified in 8e3615e158283ff8463710aff12747dc60bb1a07. Version 8e3615e158283ff8463710aff12747dc60bb1a07 of board/esd/mecp5200/config.mk left in tree. CONFLICT (delete/modify): board/esd/pf5200/config.mk deleted in HEAD and modified in 8e3615e158283ff8463710aff12747dc60bb1a07. Version 8e3615e158283ff8463710aff12747dc60bb1a07 of board/esd/pf5200/config.mk left in tree. Auto-merging board/fads/fads.h Auto-merging board/freescale/mpc5121ads/mpc5121ads.c CONFLICT (delete/modify): board/freescale/mpc8266ads/config.mk deleted in HEAD and modified in 8e3615e158283ff8463710aff12747dc60bb1a07. Version 8e3615e158283ff8463710aff12747dc60bb1a07 of board/freescale/mpc8266ads/config.mk left in tree. Auto-merging board/freescale/mx51evk/config.mk CONFLICT (delete/modify): board/gw8260/config.mk deleted in HEAD and modified in 8e3615e158283ff8463710aff12747dc60bb1a07. Version 8e3615e158283ff8463710aff12747dc60bb1a07 of board/gw8260/config.mk left in tree. CONFLICT (delete/modify): board/icecube/config.mk deleted in HEAD and modified in 8e3615e158283ff8463710aff12747dc60bb1a07. Version 8e3615e158283ff8463710aff12747dc60bb1a07 of board/icecube/config.mk left in tree. Auto-merging board/inka4x0/config.mk CONFLICT (content): Merge conflict in board/inka4x0/config.mk CONFLICT (delete/modify): board/ipek01/config.mk deleted in HEAD and modified in 8e3615e158283ff8463710aff12747dc60bb1a07. Version 8e3615e158283ff8463710aff12747dc60bb1a07 of board/ipek01/config.mk left in tree. CONFLICT (delete/modify): board/iphase4539/config.mk deleted in HEAD and modified in 8e3615e158283ff8463710aff12747dc60bb1a07. Version 8e3615e158283ff8463710aff12747dc60bb1a07 of board/iphase4539/config.mk left in tree. CONFLICT (delete/modify): board/jupiter/config.mk deleted in HEAD and modified in 8e3615e158283ff8463710aff12747dc60bb1a07. Version 8e3615e158283ff8463710aff12747dc60bb1a07 of board/jupiter/config.mk left in tree. Auto-merging board/karo/tx25/config.mk CONFLICT (content): Merge conflict in board/karo/tx25/config.mk Auto-merging board/logicpd/imx27lite/config.mk CONFLICT (content): Merge conflict in board/logicpd/imx27lite/config.mk Auto-merging board/logicpd/imx31_litekit/config.mk CONFLICT (content): Merge conflict in board/logicpd/imx31_litekit/config.mk Auto-merging board/manroland/hmi1001/config.mk CONFLICT (content): Merge conflict in board/manroland/hmi1001/config.mk CONFLICT (delete/modify): board/manroland/mucmc52/config.mk deleted in HEAD and modified in 8e3615e158283ff8463710aff12747dc60bb1a07. Version 8e3615e158283ff8463710aff12747dc60bb1a07 of board/manroland/mucmc52/config.mk left in tree. Auto-merging board/manroland/uc101/config.mk CONFLICT (content): Merge conflict in board/manroland/uc101/config.mk Auto-merging board/matrix_vision/mvsmr/config.mk CONFLICT (content): Merge conflict in board/matrix_vision/mvsmr/config.mk CONFLICT (delete/modify): board/mcc200/config.mk deleted in HEAD and modified in 8e3615e158283ff8463710aff12747dc60bb1a07. Version 8e3615e158283ff8463710aff12747dc60bb1a07 of board/mcc200/config.mk left in tree. CONFLICT (delete/modify): board/motionpro/config.mk deleted in HEAD and modified in 8e3615e158283ff8463710aff12747dc60bb1a07. Version 8e3615e158283ff8463710aff12747dc60bb1a07 of board/motionpro/config.mk left in tree. CONFLICT (delete/modify): board/munices/config.mk deleted in HEAD and modified in 8e3615e158283ff8463710aff12747dc60bb1a07. Version 8e3615e158283ff8463710aff12747dc60bb1a07 of board/munices/config.mk left in tree. CONFLICT (delete/modify): board/o2dnt/config.mk deleted in HEAD and modified in 8e3615e158283ff8463710aff12747dc60bb1a07. Version 8e3615e158283ff8463710aff12747dc60bb1a07 of board/o2dnt/config.mk left in tree. Auto-merging board/overo/config.mk CONFLICT (content): Merge conflict in board/overo/config.mk CONFLICT (delete/modify): board/phytec/pcm030/config.mk deleted in HEAD and modified in 8e3615e158283ff8463710aff12747dc60bb1a07. Version 8e3615e158283ff8463710aff12747dc60bb1a07 of board/phytec/pcm030/config.mk left in tree. CONFLICT (delete/modify): board/pm520/config.mk deleted in HEAD and modified in 8e3615e158283ff8463710aff12747dc60bb1a07. Version 8e3615e158283ff8463710aff12747dc60bb1a07 of board/pm520/config.mk left in tree. Auto-merging board/ppmc8260/config.mk CONFLICT (content): Merge conflict in board/ppmc8260/config.mk CONFLICT (delete/modify): board/rpxsuper/config.mk deleted in HEAD and modified in 8e3615e158283ff8463710aff12747dc60bb1a07. Version 8e3615e158283ff8463710aff12747dc60bb1a07 of board/rpxsuper/config.mk left in tree. CONFLICT (delete/modify): board/sacsng/config.mk deleted in HEAD and modified in 8e3615e158283ff8463710aff12747dc60bb1a07. Version 8e3615e158283ff8463710aff12747dc60bb1a07 of board/sacsng/config.mk left in tree. CONFLICT (delete/modify): board/sbc8260/config.mk deleted in HEAD and modified in 8e3615e158283ff8463710aff12747dc60bb1a07. Version 8e3615e158283ff8463710aff12747dc60bb1a07 of board/sbc8260/config.mk left in tree. CONFLICT (delete/modify): board/sorcery/config.mk deleted in HEAD and modified in 8e3615e158283ff8463710aff12747dc60bb1a07. Version 8e3615e158283ff8463710aff12747dc60bb1a07 of board/sorcery/config.mk left in tree. CONFLICT (delete/modify): board/spc1920/config.mk deleted in HEAD and modified in 8e3615e158283ff8463710aff12747dc60bb1a07. Version 8e3615e158283ff8463710aff12747dc60bb1a07 of board/spc1920/config.mk left in tree. Auto-merging board/ti/panda/config.mk CONFLICT (content): Merge conflict in board/ti/panda/config.mk Auto-merging board/ti/sdp4430/config.mk CONFLICT (content): Merge conflict in board/ti/sdp4430/config.mk CONFLICT (delete/modify): board/total5200/config.mk deleted in HEAD and modified in 8e3615e158283ff8463710aff12747dc60bb1a07. Version 8e3615e158283ff8463710aff12747dc60bb1a07 of board/total5200/config.mk left in tree. CONFLICT (delete/modify): board/tqc/tqm5200/config.mk deleted in HEAD and modified in 8e3615e158283ff8463710aff12747dc60bb1a07. Version 8e3615e158283ff8463710aff12747dc60bb1a07 of board/tqc/tqm5200/config.mk left in tree. CONFLICT (delete/modify): board/v38b/config.mk deleted in HEAD and modified in 8e3615e158283ff8463710aff12747dc60bb1a07. Version 8e3615e158283ff8463710aff12747dc60bb1a07 of board/v38b/config.mk left in tree. Auto-merging boards.cfg CONFLICT (content): Merge conflict in boards.cfg Auto-merging doc/README.arm-relocation CONFLICT (content): Merge conflict in doc/README.arm-relocation Auto-merging include/configs/A3000.h Auto-merging include/configs/ADCIOP.h Auto-merging include/configs/AMX860.h Auto-merging include/configs/AP1000.h Auto-merging include/configs/APC405.h Auto-merging include/configs/AR405.h Auto-merging include/configs/ASH405.h Auto-merging include/configs/ATUM8548.h Auto-merging include/configs/Adder.h Auto-merging include/configs/Alaska8220.h CONFLICT (content): Merge conflict in include/configs/Alaska8220.h Auto-merging include/configs/BAB7xx.h Auto-merging include/configs/BC3450.h CONFLICT (content): Merge conflict in include/configs/BC3450.h Auto-merging include/configs/BMW.h Auto-merging include/configs/CANBT.h Auto-merging include/configs/CATcenter.h Auto-merging include/configs/CMS700.h Auto-merging include/configs/CPC45.h Auto-merging include/configs/CPCI2DP.h Auto-merging include/configs/CPCI405.h Auto-merging include/configs/CPCI4052.h Auto-merging include/configs/CPCI405AB.h Auto-merging include/configs/CPCI405DT.h Auto-merging include/configs/CPCI750.h Auto-merging include/configs/CPCIISER4.h Auto-merging include/configs/CPU86.h Auto-merging include/configs/CPU87.h Auto-merging include/configs/CRAYL1.h Auto-merging include/configs/CU824.h Auto-merging include/configs/DASA_SIM.h Auto-merging include/configs/DB64360.h Auto-merging include/configs/DB64460.h Auto-merging include/configs/DP405.h Auto-merging include/configs/DU405.h Auto-merging include/configs/DU440.h Auto-merging include/configs/ELPPC.h Auto-merging include/configs/ELPT860.h Auto-merging include/configs/EP88x.h Auto-merging include/configs/ERIC.h Auto-merging include/configs/ESTEEM192E.h Auto-merging include/configs/ETX094.h Auto-merging include/configs/EVB64260.h Auto-merging include/configs/EXBITGEN.h Auto-merging include/configs/FADS823.h Auto-merging include/configs/FADS850SAR.h Auto-merging include/configs/FLAGADM.h Auto-merging include/configs/FPS850L.h Auto-merging include/configs/FPS860L.h Auto-merging include/configs/G2000.h Auto-merging include/configs/GEN860T.h Auto-merging include/configs/GENIETV.h Auto-merging include/configs/HH405.h Auto-merging include/configs/HIDDEN_DRAGON.h Auto-merging include/configs/HUB405.h Auto-merging include/configs/IAD210.h Auto-merging include/configs/ICU862.h Auto-merging include/configs/IDS8247.h Auto-merging include/configs/IP860.h Auto-merging include/configs/IPHASE4539.h Auto-merging include/configs/ISPAN.h Auto-merging include/configs/IVML24.h Auto-merging include/configs/IVMS8.h Auto-merging include/configs/IceCube.h CONFLICT (content): Merge conflict in include/configs/IceCube.h Auto-merging include/configs/JSE.h Auto-merging include/configs/KAREF.h Auto-merging include/configs/KUP4K.h Auto-merging include/configs/KUP4X.h Auto-merging include/configs/LANTEC.h Auto-merging include/configs/MBX.h Auto-merging include/configs/MBX860T.h Auto-merging include/configs/METROBOX.h Auto-merging include/configs/MHPC.h Auto-merging include/configs/MIP405.h Auto-merging include/configs/ML2.h Auto-merging include/configs/MOUSSE.h Auto-merging include/configs/MPC8260ADS.h CONFLICT (content): Merge conflict in include/configs/MPC8260ADS.h Auto-merging include/configs/MPC8266ADS.h CONFLICT (content): Merge conflict in include/configs/MPC8266ADS.h Auto-merging include/configs/MPC8308RDB.h Auto-merging include/configs/MPC8313ERDB.h Auto-merging include/configs/MPC8315ERDB.h Auto-merging include/configs/MPC8323ERDB.h Auto-merging include/configs/MPC832XEMDS.h Auto-merging include/configs/MPC8349EMDS.h Auto-merging include/configs/MPC8349ITX.h Auto-merging include/configs/MPC8360EMDS.h Auto-merging include/configs/MPC8360ERDK.h Auto-merging include/configs/MPC837XEMDS.h Auto-merging include/configs/MPC837XERDB.h Auto-merging include/configs/MPC8536DS.h Auto-merging include/configs/MPC8540ADS.h Auto-merging include/configs/MPC8540EVAL.h Auto-merging include/configs/MPC8541CDS.h Auto-merging include/configs/MPC8544DS.h Auto-merging include/configs/MPC8548CDS.h Auto-merging include/configs/MPC8555CDS.h Auto-merging include/configs/MPC8560ADS.h Auto-merging include/configs/MPC8568MDS.h Auto-merging include/configs/MPC8569MDS.h Auto-merging include/configs/MPC8572DS.h Auto-merging include/configs/MPC8610HPCD.h Auto-merging include/configs/MPC8641HPCN.h Auto-merging include/configs/MUSENKI.h Auto-merging include/configs/MVBC_P.h CONFLICT (content): Merge conflict in include/configs/MVBC_P.h Auto-merging include/configs/MVBLM7.h Auto-merging include/configs/MVBLUE.h Auto-merging include/configs/MVSMR.h CONFLICT (content): Merge conflict in include/configs/MVSMR.h Auto-merging include/configs/NC650.h Auto-merging include/configs/NETPHONE.h Auto-merging include/configs/NETTA.h Auto-merging include/configs/NETTA2.h Auto-merging include/configs/NETVIA.h Auto-merging include/configs/NSCU.h Auto-merging include/configs/NX823.h Auto-merging include/configs/OCRTC.h Auto-merging include/configs/OXC.h Auto-merging include/configs/P1022DS.h Auto-merging include/configs/P1_P2_RDB.h Auto-merging include/configs/P2020DS.h Auto-merging include/configs/P3G4.h Auto-merging include/configs/PATI.h Auto-merging include/configs/PCI405.h Auto-merging include/configs/PCIPPC2.h Auto-merging include/configs/PCIPPC6.h Auto-merging include/configs/PIP405.h Auto-merging include/configs/PLU405.h Auto-merging include/configs/PM520.h Auto-merging include/configs/PM826.h Auto-merging include/configs/PM828.h Auto-merging include/configs/PM854.h Auto-merging include/configs/PM856.h Auto-merging include/configs/PMC405.h Auto-merging include/configs/PMC440.h Auto-merging include/configs/PN62.h Auto-merging include/configs/PPChameleonEVB.h Auto-merging include/configs/QS823.h Auto-merging include/configs/QS850.h Auto-merging include/configs/QS860T.h Auto-merging include/configs/R360MPI.h Auto-merging include/configs/RBC823.h Auto-merging include/configs/RPXClassic.h Auto-merging include/configs/RPXlite.h Auto-merging include/configs/RPXlite_DW.h Auto-merging include/configs/RPXsuper.h Auto-merging include/configs/RRvision.h Auto-merging include/configs/Rattler.h Auto-merging include/configs/SBC8540.h Auto-merging include/configs/SCM.h Auto-merging include/configs/SIMPC8313.h Auto-merging include/configs/SM850.h Auto-merging include/configs/SPD823TS.h Auto-merging include/configs/SXNI855T.h Auto-merging include/configs/Sandpoint8240.h Auto-merging include/configs/Sandpoint8245.h Auto-merging include/configs/TB5200.h CONFLICT (content): Merge conflict in include/configs/TB5200.h Auto-merging include/configs/TK885D.h Auto-merging include/configs/TOP5200.h CONFLICT (content): Merge conflict in include/configs/TOP5200.h Auto-merging include/configs/TOP860.h Auto-merging include/configs/TQM5200.h Auto-merging include/configs/TQM823L.h Auto-merging include/configs/TQM823M.h Auto-merging include/configs/TQM8260.h Auto-merging include/configs/TQM8272.h Auto-merging include/configs/TQM834x.h Auto-merging include/configs/TQM850L.h Auto-merging include/configs/TQM850M.h Auto-merging include/configs/TQM855L.h Auto-merging include/configs/TQM855M.h Auto-merging include/configs/TQM85xx.h Auto-merging include/configs/TQM860L.h Auto-merging include/configs/TQM860M.h Auto-merging include/configs/TQM862L.h Auto-merging include/configs/TQM862M.h Auto-merging include/configs/TQM866M.h Auto-merging include/configs/TQM885D.h Auto-merging include/configs/Total5200.h CONFLICT (content): Merge conflict in include/configs/Total5200.h Auto-merging include/configs/VOH405.h Auto-merging include/configs/VOM405.h Auto-merging include/configs/VoVPN-GW.h Auto-merging include/configs/W7OLMC.h Auto-merging include/configs/W7OLMG.h Auto-merging include/configs/WUH405.h Auto-merging include/configs/XPEDITE1000.h Auto-merging include/configs/XPEDITE5170.h Auto-merging include/configs/XPEDITE5200.h Auto-merging include/configs/XPEDITE5370.h Auto-merging include/configs/Yukon8220.h CONFLICT (content): Merge conflict in include/configs/Yukon8220.h Auto-merging include/configs/ZPC1900.h CONFLICT (content): Merge conflict in include/configs/ZPC1900.h Auto-merging include/configs/ZUMA.h Auto-merging include/configs/aev.h CONFLICT (content): Merge conflict in include/configs/aev.h Auto-merging include/configs/alpr.h Auto-merging include/configs/aria.h Auto-merging include/configs/atc.h Auto-merging include/configs/barco.h Auto-merging include/configs/c2mon.h Auto-merging include/configs/canmb.h CONFLICT (content): Merge conflict in include/configs/canmb.h Auto-merging include/configs/cm5200.h Auto-merging include/configs/cmi_mpc5xx.h Auto-merging include/configs/cogent_mpc8260.h Auto-merging include/configs/cogent_mpc8xx.h Auto-merging include/configs/corenet_ds.h Auto-merging include/configs/cpci5200.h CONFLICT (content): Merge conflict in include/configs/cpci5200.h Auto-merging include/configs/csb272.h Auto-merging include/configs/csb472.h Auto-merging include/configs/debris.h Auto-merging include/configs/digsy_mtc.h CONFLICT (content): Merge conflict in include/configs/digsy_mtc.h Auto-merging include/configs/eXalion.h Auto-merging include/configs/ep8248.h Auto-merging include/configs/ep8260.h Auto-merging include/configs/ep82xxm.h Auto-merging include/configs/galaxy5200.h Auto-merging include/configs/gw8260.h Auto-merging include/configs/hermes.h Auto-merging include/configs/hmi1001.h CONFLICT (content): Merge conflict in include/configs/hmi1001.h Auto-merging include/configs/hymod.h Auto-merging include/configs/inka4x0.h CONFLICT (content): Merge conflict in include/configs/inka4x0.h Auto-merging include/configs/ipek01.h Auto-merging include/configs/jupiter.h Auto-merging include/configs/kmeter1.h Auto-merging include/configs/korat.h Auto-merging include/configs/kvme080.h Auto-merging include/configs/linkstation.h Auto-merging include/configs/lwmon.h Auto-merging include/configs/lwmon5.h Auto-merging include/configs/manroland/common.h Auto-merging include/configs/mcc200.h Auto-merging include/configs/mecp5123.h Auto-merging include/configs/mecp5200.h CONFLICT (content): Merge conflict in include/configs/mecp5200.h Auto-merging include/configs/mgcoge.h Auto-merging include/configs/microblaze-generic.h Auto-merging include/configs/motionpro.h Auto-merging include/configs/mpc5121ads.h Auto-merging include/configs/mpc7448hpc2.h Auto-merging include/configs/mpc8308_p1m.h Auto-merging include/configs/muas3001.h Auto-merging include/configs/munices.h Auto-merging include/configs/o2dnt.h CONFLICT (content): Merge conflict in include/configs/o2dnt.h Auto-merging include/configs/omap4_panda.h CONFLICT (content): Merge conflict in include/configs/omap4_panda.h Auto-merging include/configs/omap4_sdp4430.h CONFLICT (content): Merge conflict in include/configs/omap4_sdp4430.h Auto-merging include/configs/p3mx.h Auto-merging include/configs/p3p440.h Auto-merging include/configs/pcm030.h Auto-merging include/configs/pcs440ep.h Auto-merging include/configs/pdm360ng.h Auto-merging include/configs/pf5200.h CONFLICT (content): Merge conflict in include/configs/pf5200.h Auto-merging include/configs/ppmc7xx.h Auto-merging include/configs/ppmc8260.h Auto-merging include/configs/quantum.h Auto-merging include/configs/rmu.h Auto-merging include/configs/rsdproto.h Auto-merging include/configs/sacsng.h Auto-merging include/configs/sbc405.h Auto-merging include/configs/sbc8240.h Auto-merging include/configs/sbc8260.h Auto-merging include/configs/sbc8349.h Auto-merging include/configs/sbc8548.h Auto-merging include/configs/sbc8560.h Auto-merging include/configs/sbc8641d.h Auto-merging include/configs/sc3.h Auto-merging include/configs/socrates.h Auto-merging include/configs/sorcery.h Auto-merging include/configs/spc1920.h Auto-merging include/configs/spieval.h Auto-merging include/configs/stxgp3.h Auto-merging include/configs/stxssa.h Auto-merging include/configs/stxxtc.h Auto-merging include/configs/svm_sc8xx.h Auto-merging include/configs/uc100.h Auto-merging include/configs/utx8245.h Auto-merging include/configs/v37.h Auto-merging include/configs/v38b.h Auto-merging include/configs/ve8313.h Auto-merging include/configs/virtlab2.h Auto-merging include/configs/vme8349.h Auto-merging include/configs/zeus.h Auto-merging onenand_ipl/board/vpac270/Makefile Automatic merge failed; fix conflicts and then commit the result.
Sorry, these are way too many merge conflicts for me to fix.
Best regards,
Wolfgang Denk
Dear Marek Vasut,
In message 201010192228.34814.marek.vasut@gmail.com you wrote:
Hi, please pull my git://git.denx.de/u-boot-pxa for-wd-testing branch into your u- boot-testing/Makefile-cleanup branch. Thanks
The following changes since commit a5cb985d8006bd1bb6d188b84f435f5d007fd6ac:
Makefile: move all Power Architecture boards into boards.cfg (2010-10-17 01:34:08 +0200)
are available in the git repository at: git://git.denx.de/u-boot-pxa.git for-wd-testing
Marek Vasut (19): PXA: pxafb: Fix indent problems PXA: pxa-regs.h cleanup PXA: pxafb: Add ACX517AKN support PXA: pxafb: Add support for Sharp LQ038J7DH53 PXA: pxafb: Marvell Littleton LCD definition common: Enable serial for PXA250 PXA: Palm Tungsten|C Support PXA: Add initial Palm LifeDrive support PXA: Voipac270 improvements PXA: Balloon3 board support PXA: Add missing MAINTAINERS entries PXA: Add necessary information for RELOC PXA: Fix reloc, Push lowlevel init into C code PXA: Fix vpac270 for Reloc PXA: Fix ZipitZ2 for Reloc PXA: Fix Balloon3 for Reloc PXA: Fix vpac270 OneNAND booter Build: PXA: Fix Vpac270 build variants Build: PXA: Fix TrizepsIV build variants
Mikhail Kshevetskiy (4): PXA: remove unused u-boot.lds from board/vpac270 PXA: cleanup vpac270 config and set CONFIG_SYS_HZ to 1000 PXA: fix environment sector size, kernel and environment location for vpac270 PXA: fix MDREFR[APD] bit setting
MAINTAINERS | 9 + MAKEALL | 7 +- Makefile | 17 - arch/arm/cpu/pxa/cpu.c | 255 +++- arch/arm/cpu/pxa/i2c.c | 69 +- arch/arm/cpu/pxa/pxafb.c | 365 +++-- arch/arm/cpu/pxa/start.S | 346 ++--- arch/arm/cpu/pxa/timer.c | 7 +- arch/arm/cpu/pxa/usb.c | 61 +- arch/arm/include/asm/arch-pxa/hardware.h | 61 +- arch/arm/include/asm/arch-pxa/macro.h | 20 +- arch/arm/include/asm/arch-pxa/pxa-regs.h | 2688 +++++++++++++++-------------- board/balloon3/Makefile | 47 + board/balloon3/balloon3.c | 238 +++ board/colibri_pxa270/colibri_pxa270.c | 33 +- board/cradle/cradle.c | 5 +- board/cradle/lowlevel_init.S | 4 +- board/csb226/csb226.c | 13 +- board/delta/delta.c | 37 +- board/delta/nand.c | 110 +- board/innokom/innokom.c | 14 +- board/palmld/Makefile | 49 + board/palmld/config.mk | 1 + board/{zipitz2 => palmld}/lowlevel_init.S | 9 +- board/palmld/palmld.c | 69 + board/{vpac270 => palmld}/u-boot.lds | 7 +- board/palmtc/Makefile | 49 + board/palmtc/config.mk | 1 + board/{vpac270 => palmtc}/lowlevel_init.S | 3 +- board/palmtc/palmtc.c | 59 + board/{vpac270 => palmtc}/u-boot.lds | 7 +- board/pxa255_idp/pxa_idp.c | 27 +- board/trizepsiv/conxs.c | 35 +- board/vpac270/Makefile | 17 +- board/vpac270/config.mk | 1 - board/vpac270/vpac270.c | 92 +- board/wepep250/wepep250.c | 11 +- board/zipitz2/Makefile | 10 +- board/zipitz2/config.mk | 1 - board/zipitz2/zipitz2.c | 57 +- board/zylonite/nand.c | 110 +- boards.cfg | 8 + common/serial.c | 2 +- drivers/mmc/pxa_mmc.c | 98 +- drivers/serial/serial_pxa.c | 94 +- include/configs/balloon3.h | 274 +++ include/configs/cerf250.h | 3 + include/configs/colibri_pxa270.h | 3 + include/configs/cradle.h | 5 +- include/configs/csb226.h | 3 + include/configs/delta.h | 4 + include/configs/innokom.h | 3 + include/configs/lubbock.h | 3 + include/configs/palmld.h | 276 +++ include/configs/palmtc.h | 248 +++ include/configs/pleb2.h | 3 + include/configs/pxa255_idp.h | 3 + include/configs/trizepsiv.h | 3 + include/configs/vpac270.h | 138 +- include/configs/wepep250.h | 4 + include/configs/xaeniax.h | 3 + include/configs/xm250.h | 3 + include/configs/xsengine.h | 3 + include/configs/zipitz2.h | 10 +- include/configs/zylonite.h | 3 + onenand_ipl/board/vpac270/Makefile | 5 +- 66 files changed, 4017 insertions(+), 2206 deletions(-) create mode 100644 board/balloon3/Makefile create mode 100644 board/balloon3/balloon3.c create mode 100644 board/palmld/Makefile create mode 100644 board/palmld/config.mk rename board/{zipitz2 => palmld}/lowlevel_init.S (90%) create mode 100644 board/palmld/palmld.c copy board/{vpac270 => palmld}/u-boot.lds (90%) create mode 100644 board/palmtc/Makefile create mode 100644 board/palmtc/config.mk rename board/{vpac270 => palmtc}/lowlevel_init.S (95%) create mode 100644 board/palmtc/palmtc.c rename board/{vpac270 => palmtc}/u-boot.lds (90%) delete mode 100644 board/vpac270/config.mk delete mode 100644 board/zipitz2/config.mk create mode 100644 include/configs/balloon3.h create mode 100644 include/configs/palmld.h create mode 100644 include/configs/palmtc.h
Dunno what was wrong with your tree.
Cherry-picked the commits one by one.
Thanks.
Best regards,
Wolfgang Denk
participants (2)
-
Marek Vasut -
Wolfgang Denk