From: Zoltan Herpai <wigyori@uid0.hu>
Date: Wed, 20 Nov 2013 10:23:49 +0000 (+0000)
Subject: mxs: build/profile-related changes - change uImage creation to use zImage - update... 
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=2bc70cfbace7d696ae37215e7895d4572d2b3f4d;p=openwrt%2Fstaging%2Fzorun.git

mxs: build/profile-related changes - change uImage creation to use zImage - update image Makefile for further boards with u-boot support - add profile for OLinuXino Micro/Nano boards

Signed-off-by: Zoltan HERPAI <wigyori@uid0.hu>

SVN-Revision: 38876
---

diff --git a/target/linux/mxs/image/Makefile b/target/linux/mxs/image/Makefile
index 7c5c33168c..59a89e9d50 100644
--- a/target/linux/mxs/image/Makefile
+++ b/target/linux/mxs/image/Makefile
@@ -21,11 +21,11 @@ define Image/BuildKernel/olinuxino-bootlet
 	)
 endef
 
-define Image/BuildKernel/olinuxino-uboot
+define Image/BuildKernel/mxs-uboot
 	mkimage -A arm -O linux -T kernel -C none \
 		-a 0x40008000 -e 0x40008000 \
 		-n 'ARM OpenWrt Linux-$(LINUX_VERSION)' \
-		-d $(KDIR)/vmlinux $(KDIR)/uImage
+		-d $(KDIR)/zImage $(KDIR)/uImage
 	cp $(KDIR)/uImage $(BIN_DIR)/$(IMG_PREFIX)-uImage
 endef
 
@@ -36,7 +36,7 @@ define Image/BuildKernel
   endif
 
   ifeq ($(CONFIG_PACKAGE_uboot-mxs-mx23_olinuxino),y)
-	$(call Image/BuildKernel/olinuxino-uboot)
+	$(call Image/BuildKernel/mxs-uboot)
   endif
   
 	$(CP) $(LINUX_DIR)/arch/arm/boot/zImage $(BIN_DIR)/openwrt-$(BOARD)-zImage
diff --git a/target/linux/mxs/profiles/01-olinuxino-maxi.mk b/target/linux/mxs/profiles/01-olinuxino-maxi.mk
new file mode 100644
index 0000000000..408d26dbd9
--- /dev/null
+++ b/target/linux/mxs/profiles/01-olinuxino-maxi.mk
@@ -0,0 +1,20 @@
+#
+# Copyright (C) 2013 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+define Profile/olinuxino-maxi
+  NAME:=Olimex OLinuXino MAXI/MINI boards
+  PACKAGES += imx-bootlets uboot-mxs-mx23_olinuxino \
+	  kmod-usb-mxs-phy kmod-usb-net kmod-usb-net-smsc95xx \
+	  kmod-gpio-mcp23s08 kmod-leds-gpio kmod-ledtrig-heartbeat kmod-rtc-stmp3xxx \
+	  kmod-sound-core kmod-sound-soc-mxs kmod-iio-mxs-lradc kmod-crypto-hw-dcp
+endef
+
+define Profile/olinuxino-maxi/Description
+	Olimex OLinuXino MAXI/MINI boards
+endef
+$(eval $(call Profile,olinuxino-maxi))
+
diff --git a/target/linux/mxs/profiles/01-olinuxino.mk b/target/linux/mxs/profiles/01-olinuxino.mk
deleted file mode 100644
index 359176e94a..0000000000
--- a/target/linux/mxs/profiles/01-olinuxino.mk
+++ /dev/null
@@ -1,20 +0,0 @@
-#
-# Copyright (C) 2013 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-define Profile/olinuxino
-  NAME:=Olimex Olinuxino boards
-  PACKAGES += imx-bootlets uboot-mxs-mx23_olinuxino \
-	  kmod-usb-mxs-phy kmod-usb-net kmod-usb-net-smsc95xx \
-	  kmod-gpio-mcp23s08 kmod-leds-gpio kmod-ledtrig-heartbeat kmod-rtc-stmp3xxx \
-	  kmod-sound-core kmod-sound-soc-mxs kmod-iio-mxs-lradc kmod-crypto-hw-dcp
-endef
-
-define Profile/olinuxino/Description
-	Olimex Olinuxino boards
-endef
-$(eval $(call Profile,olinuxino))
-
diff --git a/target/linux/mxs/profiles/03-olinuxino-micro.mk b/target/linux/mxs/profiles/03-olinuxino-micro.mk
new file mode 100644
index 0000000000..7079f9c50e
--- /dev/null
+++ b/target/linux/mxs/profiles/03-olinuxino-micro.mk
@@ -0,0 +1,21 @@
+#
+# Copyright (C) 2013 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+define Profile/olinuxino-micro
+  NAME:=Olimex OLinuXino Micro/Nano boards
+  PACKAGES += imx-bootlets uboot-mxs-mx23_olinuxino \
+	  kmod-usb-mxs-phy kmod-gpio-mcp23s08 kmod-leds-gpio \
+	  kmod-ledtrig-heartbeat kmod-rtc-stmp3xxx \
+	  kmod-iio-mxs-lradc kmod-crypto-hw-dcp
+endef
+
+define Profile/olinuxino-micro/Description
+	Olimex OLinuXino Micro/Nano boards
+endef
+
+$(eval $(call Profile,olinuxino-micro))
+