From: Minkyu Kang Date: Thu, 1 Jul 2010 05:13:24 +0000 (+0900) Subject: Merge branch 'master' of git://git.denx.de/u-boot X-Git-Tag: JG01_20100712~7 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=0e06d653d26faacc75992095aac932a58581d758;p=kernel%2Fu-boot.git Merge branch 'master' of git://git.denx.de/u-boot Conflicts: Makefile arch/arm/cpu/arm926ejs/start.S arch/arm/cpu/arm_cortexa8/start.S Signed-off-by: Minkyu Kang --- 0e06d653d26faacc75992095aac932a58581d758 diff --cc Makefile index dc2696c,1d87f37..64f9966 --- a/Makefile +++ b/Makefile @@@ -3011,15 -2053,9 +2078,15 @@@ nhk8815_onenand_config: unconfi @ > $(obj)include/config.h @if [ "$(findstring _onenand, $@)" ] ; then \ echo "#define CONFIG_BOOT_ONENAND" >> $(obj)include/config.h; \ - $(XECHO) "... configured to boot from OneNand Flash"; \ - else \ - $(XECHO) "... configured to boot from Nand Flash"; \ fi - @$(MKCONFIG) -a nhk8815 arm arm926ejs nhk8815 st nomadik + @$(MKCONFIG) -n $@ -a nhk8815 arm arm926ejs nhk8815 st nomadik - omap1510inn_config : unconfig - @$(MKCONFIG) $(@:_config=) arm arm925t omap1510inn ti ++ex1_config : unconfig ++ @mkdir -p $(obj)include ++ @echo "#define CONFIG_ONENAND_U_BOOT" > $(obj)include/config.h ++ @$(MKCONFIG) $(@:_config=) arm arm926ejs ex1 samsung drime3 ++ @echo "CONFIG_ONENAND_U_BOOT = y" >> $(obj)include/config.mk + xtract_omap1610xxx = $(subst _cs0boot,,$(subst _cs3boot,,$(subst _cs_autoboot,,$(subst _config,,$1)))) omap1610inn_config \ @@@ -3155,104 -2151,7 +2182,39 @@@ versatileab_config versatilepb_config : unconfig @board/armltd/versatile/split_by_variant.sh $@ - voiceblue_config: unconfig - @$(MKCONFIG) $(@:_config=) arm arm925t voiceblue - - ######################################################################### - ## S3C44B0 Systems - ######################################################################### - - B2_config : unconfig - @$(MKCONFIG) $(@:_config=) arm s3c44b0 B2 dave - - ######################################################################### - ## ARM720T Systems - ######################################################################### - - armadillo_config: unconfig - @$(MKCONFIG) $(@:_config=) arm arm720t armadillo - - ep7312_config : unconfig - @$(MKCONFIG) $(@:_config=) arm arm720t ep7312 - - impa7_config : unconfig - @$(MKCONFIG) $(@:_config=) arm arm720t impa7 - - modnet50_config : unconfig - @$(MKCONFIG) $(@:_config=) arm arm720t modnet50 - - evb4510_config : unconfig - @$(MKCONFIG) $(@:_config=) arm arm720t evb4510 NULL s3c4510b - - lpc2292sodimm_config: unconfig - @$(MKCONFIG) $(@:_config=) arm arm720t lpc2292sodimm NULL lpc2292 - - SMN42_config : unconfig - @$(MKCONFIG) $(@:_config=) arm arm720t SMN42 siemens lpc2292 - ######################################################################### +## ARM CORTEX Systems +######################################################################### + - am3517_evm_config : unconfig - @$(MKCONFIG) $(@:_config=) arm arm_cortexa8 am3517evm logicpd omap3 - - devkit8000_config : unconfig - @$(MKCONFIG) $(@:_config=) arm arm_cortexa8 devkit8000 timll omap3 - - omap3_beagle_config : unconfig - @$(MKCONFIG) $(@:_config=) arm arm_cortexa8 beagle ti omap3 - - omap3_overo_config : unconfig - @$(MKCONFIG) $(@:_config=) arm arm_cortexa8 overo NULL omap3 - - omap3_evm_config : unconfig - @$(MKCONFIG) $(@:_config=) arm arm_cortexa8 evm ti omap3 - - omap3_pandora_config : unconfig - @$(MKCONFIG) $(@:_config=) arm arm_cortexa8 pandora NULL omap3 - - omap3_sdp3430_config : unconfig - @$(MKCONFIG) $(@:_config=) arm arm_cortexa8 sdp3430 ti omap3 - - omap3_zoom1_config : unconfig - @$(MKCONFIG) $(@:_config=) arm arm_cortexa8 zoom1 logicpd omap3 - - omap3_zoom2_config : unconfig - @$(MKCONFIG) $(@:_config=) arm arm_cortexa8 zoom2 logicpd omap3 - - s5p_goni_config: unconfig - @$(MKCONFIG) $(@:_config=) arm arm_cortexa8 goni samsung s5pc1xx - +smdkc100_config: unconfig + @echo "#define CONFIG_ONENAND_U_BOOT" > $(obj)include/config.h + @$(MKCONFIG) $(@:_config=) arm arm_cortexa8 smdkc100 samsung s5pc1xx + @echo "CONFIG_ONENAND_U_BOOT = y" >> $(obj)include/config.mk + @echo "ONENAND_BIN = $(obj)onenand_ipl/onenand-ipl-16k.bin" >> $(obj)include/config.mk + +s5pc1xx_universal_mmc_config \ +s5pc1xx_universal_config: unconfig + @if [ "$(findstring mmc,$@)" ] ; then \ + echo "#define CONFIG_MMC_U_BOOT" > $(obj)include/config.h ; \ + else \ + echo "#define CONFIG_ONENAND_U_BOOT" > $(obj)include/config.h ; \ + fi; + @$(MKCONFIG) -a s5pc1xx_universal arm arm_cortexa8 universal samsung s5pc1xx + @if [ "$(findstring mmc,$@)" ] ; then \ + echo "CONFIG_MMC_U_BOOT = y" >> $(obj)include/config.mk ; \ + else \ + echo "CONFIG_ONENAND_U_BOOT = y" >> $(obj)include/config.mk ; \ + echo "ONENAND_BIN = $(obj)onenand_ipl/onenand-ipl-16k.bin" >> $(obj)include/config.mk ; \ + echo "CONFIG_RECOVERY_U_BOOT = y" >> $(obj)include/config.mk ; \ + fi; + +s5pc1xx_p1p2_config: unconfig + @echo "#define CONFIG_ONENAND_U_BOOT" > $(obj)include/config.h + @$(MKCONFIG) $(@:_config=) arm arm_cortexa8 p1p2 samsung s5pc1xx + @echo "CONFIG_ONENAND_U_BOOT = y" >> $(obj)include/config.mk + @echo "ONENAND_BIN = $(obj)onenand_ipl/onenand-ipl-16k.bin" >> $(obj)include/config.mk + +######################################################################### ## XScale Systems ######################################################################### @@@ -3385,42 -2208,15 +2271,21 @@@ smdk6400_config : unconfi @mkdir -p $(obj)include $(obj)board/samsung/smdk6400 @mkdir -p $(obj)nand_spl/board/samsung/smdk6400 @echo "#define CONFIG_NAND_U_BOOT" > $(obj)include/config.h + @echo "CONFIG_NAND_U_BOOT = y" >> $(obj)include/config.mk @if [ -z "$(findstring smdk6400_noUSB_config,$@)" ]; then \ echo "RAM_TEXT = 0x57e00000" >> $(obj)board/samsung/smdk6400/config.tmp;\ - $(MKCONFIG) $(@:_config=) arm arm1176 smdk6400 samsung s3c64xx; \ else \ echo "RAM_TEXT = 0xc7e00000" >> $(obj)board/samsung/smdk6400/config.tmp;\ - $(MKCONFIG) $(@:_noUSB_config=) arm arm1176 smdk6400 samsung s3c64xx; \ fi + @$(MKCONFIG) smdk6400 arm arm1176 smdk6400 samsung s3c64xx @echo "CONFIG_NAND_U_BOOT = y" >> $(obj)include/config.mk +smdk6442_config: unconfig + @echo "#define CONFIG_ONENAND_U_BOOT" > $(obj)include/config.h + @$(MKCONFIG) $(@:_config=) arm arm1176 smdk6442 samsung s5p64xx + @echo "CONFIG_ONENAND_U_BOOT = y" >> $(obj)include/config.mk + @echo "ONENAND_BIN = $(obj)onenand_ipl/onenand-ipl-8k.bin" >> $(obj)include/config.mk + - tnetv107x_evm_config: unconfig - @$(MKCONFIG) $(@:_config=) arm arm1176 tnetv107xevm ti tnetv107x - - #======================================================================== - # i386 - #======================================================================== - ######################################################################### - ## AMD SC520 CDP - ######################################################################### - eNET_config : unconfig - @$(MKCONFIG) $(@:_config=) i386 i386 eNET NULL sc520 - - sc520_cdp_config : unconfig - @$(MKCONFIG) $(@:_config=) i386 i386 sc520_cdp NULL sc520 - - sc520_spunk_config : unconfig - @$(MKCONFIG) $(@:_config=) i386 i386 sc520_spunk NULL sc520 - - sc520_spunk_rel_config : unconfig - @$(MKCONFIG) $(@:_config=) i386 i386 sc520_spunk NULL sc520 - #======================================================================== # MIPS #======================================================================== diff --cc arch/arm/cpu/arm926ejs/start.S index 922da08,cf40ce1..af17356 --- a/arch/arm/cpu/arm926ejs/start.S +++ b/arch/arm/cpu/arm926ejs/start.S @@@ -196,8 -196,7 +196,9 @@@ stack_setup #endif #endif /* CONFIG_PRELOADER */ sub sp, r0, #12 /* leave 3 words for abort-stack */ +#ifndef CONFIG_PRELOADER + bic sp, r0, #7 /* 8-byte align stack for ABI compliance */ + bic sp, sp, #7 /* 8-byte alignment for ABI compliance */ clear_bss: ldr r0, _bss_start /* find start of bss segment */ diff --cc arch/arm/cpu/arm_cortexa8/start.S index 98089a0,1e0a150..52ab61b --- a/arch/arm/cpu/arm_cortexa8/start.S +++ b/arch/arm/cpu/arm_cortexa8/start.S @@@ -175,10 -164,8 +175,10 @@@ stack_setup sub r0, r0, #(CONFIG_STACKSIZE_IRQ + CONFIG_STACKSIZE_FIQ) #endif sub sp, r0, #12 @ leave 3 words for abort-stack +#endif /* CONFIG_PRELOADER */ - and sp, sp, #~7 @ 8 byte alinged for (ldr/str)d + bic sp, sp, #7 @ 8-byte alignment for ABI compliance +#if !defined(CONFIG_PRELOADER) && !defined(CONFIG_RECOVERY_BLOCK) /* Clear BSS (if any). Is below tx (watch load addr - need space) */ clear_bss: ldr r0, _bss_start @ find start of bss segment