summaryrefslogtreecommitdiffstats
path: root/target/linux/omap/image
diff options
context:
space:
mode:
authorImre Kaloz <kaloz@openwrt.org>2013-11-08 12:44:38 +0000
committerImre Kaloz <kaloz@openwrt.org>2013-11-08 12:44:38 +0000
commit06d0fda4d1220ea54c2886df594320f19622a98c (patch)
tree70520b668371ddd7d0e5386867763fc4895a37df /target/linux/omap/image
parent1381fa6c5c4d1d3bb6d69f6d5869722af28e3e39 (diff)
downloadmaster-31e0f0ae-06d0fda4d1220ea54c2886df594320f19622a98c.tar.gz
master-31e0f0ae-06d0fda4d1220ea54c2886df594320f19622a98c.tar.bz2
master-31e0f0ae-06d0fda4d1220ea54c2886df594320f19622a98c.zip
switch to 3.12, enable support for AM33xx/OMAP3
Signed-off-by: Imre Kaloz <kaloz@openwrt.org> SVN-Revision: 38692
Diffstat (limited to 'target/linux/omap/image')
-rw-r--r--target/linux/omap/image/Makefile8
-rw-r--r--target/linux/omap/image/boot.script4
2 files changed, 8 insertions, 4 deletions
diff --git a/target/linux/omap/image/Makefile b/target/linux/omap/image/Makefile
index e118122bd4..afd8398e2f 100644
--- a/target/linux/omap/image/Makefile
+++ b/target/linux/omap/image/Makefile
@@ -1,5 +1,5 @@
#
-# Copyright (C) 2012 OpenWrt.org
+# Copyright (C) 2012-2013 OpenWrt.org
#
# This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information.
@@ -9,7 +9,11 @@ include $(INCLUDE_DIR)/image.mk
define Image/BuildKernel
mkimage -A arm -O linux -T script -C none -a 0 -e 0 -n 'Boot Image' -d boot.script $(BIN_DIR)/boot.scr
- cp $(KDIR)/uImage $(BIN_DIR)/openwrt-$(BOARD)-uImage
+ cp $(KDIR)/zImage $(BIN_DIR)/openwrt-$(BOARD)-zImage
+ -mkdir $(BIN_DIR)/dtbs
+ $(CP) $(LINUX_DIR)/arch/arm/boot/dts/am335x*.dtb $(BIN_DIR)/dtbs/
+ $(CP) $(LINUX_DIR)/arch/arm/boot/dts/omap3*.dtb $(BIN_DIR)/dtbs/
+ $(CP) $(LINUX_DIR)/arch/arm/boot/dts/omap4*.dtb $(BIN_DIR)/dtbs/
endef
define Image/Build
diff --git a/target/linux/omap/image/boot.script b/target/linux/omap/image/boot.script
index d884a70195..ecdacfc60a 100644
--- a/target/linux/omap/image/boot.script
+++ b/target/linux/omap/image/boot.script
@@ -1,3 +1,3 @@
-fatload mmc 0:1 0x80000000 openwrt-omap-uImage
+fatload mmc 0:1 0x80000000 openwrt-omap-zImage
setenv bootargs vram=32M fixrtc mem=1G@0x80000000 root=/dev/mmcblk0p2 rootfstype=ext4 console=ttyO2,115200n8 rootwait
-bootm 0x80000000
+bootz 0x80000000