From 7fa0a94b30c5c56fed6e46cccd669d621a7d2f12 Mon Sep 17 00:00:00 2001 From: Kyungmin Park Date: Tue, 29 Dec 2009 18:55:08 +0900 Subject: [PATCH] s5pc110: aquila: Use proper EVT names Signed-off-by: Kyungmin Park --- build.sh | 22 +++++++++++++--------- onenand_ipl/board/samsung/universal/Makefile | 14 ++++++++------ 2 files changed, 21 insertions(+), 15 deletions(-) diff --git a/build.sh b/build.sh index 2ba06c5..3951c29 100755 --- a/build.sh +++ b/build.sh @@ -38,9 +38,11 @@ build_uboot() make ARCH=arm CROSS_COMPILE="$CCACHE $CROSS_COMPILER" $JOBS $* } -make_evt1_image() +make_evt_image() { - cat onenand_ipl/onenand-ipl-16k-1.bin u-boot.bin > u-boot-onenand1.bin + cat onenand_ipl/onenand-ipl-16k-evt0.bin u-boot.bin > u-boot-onenand-evt0.bin + # To distinguish previous u-boot-onenand.bin, it uses the evt1 suffix + cp u-boot-onenand.bin u-boot-onenand-evt1.bin } check_ccache @@ -48,7 +50,7 @@ check_users build_uboot $* -make_evt1_image +make_evt_image size=`ls -al u-boot-onenand.bin | awk -F' ' '{printf $5}'` if [ "$size" -ge "262144" ]; then @@ -57,18 +59,20 @@ if [ "$size" -ge "262144" ]; then fi if [ "$USER" = "kmpark" ]; then - cp -f u-boot.bin u-boot-onenand.bin /tftpboot - ls -al u-boot.bin u-boot-onenand.bin + ls -al u-boot.bin u-boot-onenand.bin u-boot-onenand-evt0.bin + # To prevent wrong program + cp -f u-boot-onenand-evt0.bin u-boot-onenand.bin + cp -f u-boot.bin u-boot-onenand.bin u-boot-onenand-evt0.bin /tftpboot ls -al onenand_ipl pushd ../images ./system.sh popd elif [ "$USER" = "dofmind" ]; then - tar cvf system_uboot_evt0.tar u-boot-onenand.bin - tar cvf system_uboot_evt1.tar u-boot-onenand1.bin + tar cvf system_uboot_evt0.tar u-boot-onenand-evt0.bin + tar cvf system_uboot_evt1.tar u-boot-onenand-evt1.bin mv -f system_uboot_*.tar /home/work elif [ "$USER" = "prom" ]; then - tar cvf system_uboot_evt0.tar u-boot-onenand.bin - tar cvf system_uboot_evt1.tar u-boot-onenand1.bin + tar cvf system_uboot_evt0.tar u-boot-onenand-evt0.bin + tar cvf system_uboot_evt1.tar u-boot-onenand-evt1.bin mv -f system_uboot* /home/share/Work/bin fi diff --git a/onenand_ipl/board/samsung/universal/Makefile b/onenand_ipl/board/samsung/universal/Makefile index a37a83d..5099e99 100644 --- a/onenand_ipl/board/samsung/universal/Makefile +++ b/onenand_ipl/board/samsung/universal/Makefile @@ -42,16 +42,18 @@ LNDIR := $(OBJTREE)/onenand_ipl/board/$(BOARDDIR) onenandobj := $(OBJTREE)/onenand_ipl/ -ALL = $(onenandobj)onenand-ipl $(onenandobj)onenand-ipl.bin $(onenandobj)onenand-ipl-16k.bin +ALL = $(onenandobj)onenand-ipl $(onenandobj)onenand-ipl.bin $(onenandobj)onenand-ipl-16k-evt0.bin $(onenandobj)onenand-ipl-16k-evt1.bin all: $(obj).depend $(ALL) -$(onenandobj)onenand-ipl-16k.bin: $(onenandobj)onenand-ipl checksum - $(OBJCOPY) ${OBJCFLAGS} --pad-to=$(TEXT_BASE16K_EVT1) -O binary $< $@ - $(onenandobj)/board/$(BOARDDIR)/checksum $(onenandobj)onenand-ipl-16k.bin 1 - cat $(onenandobj)/board/$(BOARDDIR)/header.bin $(onenandobj)onenand-ipl-16k.bin > $(onenandobj)onenand-ipl-16k-1.bin +$(onenandobj)onenand-ipl-16k-evt0.bin: $(onenandobj)onenand-ipl checksum $(OBJCOPY) ${OBJCFLAGS} --pad-to=$(TEXT_BASE16K_EVT0) -O binary $< $@ - $(onenandobj)/board/$(BOARDDIR)/checksum $(onenandobj)onenand-ipl-16k.bin 0 + $(onenandobj)/board/$(BOARDDIR)/checksum $@ 0 + +$(onenandobj)onenand-ipl-16k-evt1.bin: $(onenandobj)onenand-ipl checksum + $(OBJCOPY) ${OBJCFLAGS} --pad-to=$(TEXT_BASE16K_EVT1) -O binary $< $@ + $(onenandobj)/board/$(BOARDDIR)/checksum $@ 1 + cat $(onenandobj)/board/$(BOARDDIR)/header.bin $@ > $(onenandobj)onenand-ipl-16k.bin $(onenandobj)onenand-ipl.bin: $(onenandobj)onenand-ipl $(OBJCOPY) ${OBJCFLAGS} -O binary $< $@ -- 2.7.4