Browse Source

add mkimage to tools dir, update to latest stable kernel

Waldemar Brodkorb 13 years ago
parent
commit
03eda9a37f
3 changed files with 9 additions and 6 deletions
  1. 0 1
      TODO
  2. 8 2
      target/foxg20/Makefile
  3. 1 3
      target/foxg20/target.mk

+ 0 - 1
TODO

@@ -6,7 +6,6 @@
 - vim tabbing for split command - terminal issue
 - fix install.sh for MacOS X host, use pbr+core.img from grub2-bin
 - check alsa on foxg20 target
-- add mkimage to tools build
 - fix ARM OABI support
 - fix watchdog for alix1c (mfgpt timers problem)
 - add support for brcm 2.6 (flash support)

+ 8 - 2
target/foxg20/Makefile

@@ -7,12 +7,18 @@ include $(TOPDIR)/mk/modules.mk
 include $(TOPDIR)/mk/kernel-build.mk
 include $(TOPDIR)/mk/image.mk
 
+$(TOOLS_BUILD_DIR):
+	@mkdir -p $(TOOLS_BUILD_DIR)
+
+tools-compile: $(TOOLS_BUILD_DIR)
+	$(MAKE) -C ../tools/uboot-mkimage
+
 KERNEL:=$(BUILD_DIR)/${ADK_TARGET}-${FS}-kernel
 LOADADDR:=	0x20008000
 
-kernel-install:
+kernel-install: tools-compile
 	@gzip -9 < $(LINUX_DIR)/arch/arm/boot/Image > ${BUILD_DIR}/Image.gz
-	@mkimage -A arm -O linux -T kernel -C gzip \
+	PATH='${TARGET_PATH}' mkimage -A arm -O linux -T kernel -C gzip \
 		-a ${LOADADDR} -e ${LOADADDR} -d ${BUILD_DIR}/Image.gz \
 		-n foxg20 $(TARGET_DIR)/boot/vmlinuz-adk $(MAKE_TRACE)
 	@cp $(TARGET_DIR)/boot/vmlinuz-adk \

+ 1 - 3
target/foxg20/target.mk

@@ -1,8 +1,6 @@
 # arm default is little endian, this target uses EABI
+include $(TOPDIR)/mk/kernel-ver.mk
 ARCH:=			arm
 CPU_ARCH:=		arm
-KERNEL_VERSION:=	2.6.35.7
-KERNEL_RELEASE:=	1
-KERNEL_MD5SUM:=		f741879bcd3a5366a1bbe0ad5cdb7935
 TARGET_OPTIMIZATION:=	-Os -pipe
 TARGET_CFLAGS_ARCH:=    -march=armv5te -mtune=arm926ej-s