summaryrefslogtreecommitdiff
path: root/target/foxg20
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2010-06-28 10:38:59 +0200
committerWaldemar Brodkorb <wbx@openadk.org>2010-06-28 10:38:59 +0200
commite9e7c5715ae2cb168dfe56192a3a1d5aacc70b23 (patch)
tree25656fc11aa2d35418a76114f8d82262e9536bad /target/foxg20
parent1143ead360fb043f43388d727e710f358702bc9a (diff)
fix busybox rebuild issue, simplify target Makefiles
Diffstat (limited to 'target/foxg20')
-rw-r--r--target/foxg20/Makefile20
1 files changed, 8 insertions, 12 deletions
diff --git a/target/foxg20/Makefile b/target/foxg20/Makefile
index 5762b4939..8c97fc4ad 100644
--- a/target/foxg20/Makefile
+++ b/target/foxg20/Makefile
@@ -7,35 +7,31 @@ include $(TOPDIR)/mk/modules.mk
include $(TOPDIR)/mk/kernel-build.mk
include $(TOPDIR)/mk/image.mk
+KERNEL:=$(BUILD_DIR)/${ADK_TARGET}-${FS}-kernel
LOADADDR:= 0x20008000
kernel-install:
- gzip -9 < $(LINUX_DIR)/arch/arm/boot/Image > ${BUILD_DIR}/Image.gz
- mkimage -A arm -O linux -T kernel -C gzip \
+ @gzip -9 < $(LINUX_DIR)/arch/arm/boot/Image > ${BUILD_DIR}/Image.gz
+ @mkimage -A arm -O linux -T kernel -C gzip \
-a ${LOADADDR} -e ${LOADADDR} -d ${BUILD_DIR}/Image.gz \
- -n foxg20 $(TARGET_DIR)/boot/uImage $(MAKE_TRACE)
- @cp $(TARGET_DIR)/boot/uImage \
+ -n foxg20 $(TARGET_DIR)/boot/vmlinuz-adk $(MAKE_TRACE)
+ @cp $(TARGET_DIR)/boot/vmlinuz-adk \
$(BUILD_DIR)/${ADK_TARGET}-${FS}-kernel
ifeq ($(FS),nfsroot)
-imageinstall: ${BIN_DIR}/${ROOTFSUSERTARBALL}
+imageinstall: kernel-install ${BIN_DIR}/${ROOTFSUSERTARBALL}
@cp $(BUILD_DIR)/${ADK_TARGET}-${FS}-kernel \
$(BIN_DIR)/${ADK_TARGET}-${FS}-kernel
- @echo
@echo 'Type dhcp via u-boot prompt to load kernel'
@echo 'After that type bootm to load the kernel'
- @echo 'Login as user root with password linux123 via ssh or console'
endif
-
ifeq ($(FS),ext2-block)
-imageinstall: $(BIN_DIR)/$(ROOTFSTARBALL)
- @echo
+imageinstall: kernel-install $(BIN_DIR)/$(ROOTFSTARBALL)
@echo "The RootFS tarball is:"
@echo "$(BIN_DIR)/$(ROOTFSTARBALL)"
@echo 'Before booting from MicroSD card you need to set following u-boot environment variables:'
- @echo "setenv bootcmd 'mmc init; sleep 1; fatload mmc 0 0x22000000 uimage; bootm 0x22000000'"
+ @echo "setenv bootcmd 'mmc init; sleep 1; fatload mmc 0 0x22000000 vmlinuz-adk; bootm 0x22000000'"
@echo
@echo "Boot the board via network and use adkinstall."
@echo "If you just want to update, use adkupdate."
- @echo 'Login as user root with password linux123 via ssh or console.'
endif