sunxi: boot changes - Added uEnv.txt to facilitate automatic boot. - Cosmetic fix...

Signed-off-by: Zalan Blenessy <zalan.blenessy@gmail.com>
Signed-off-by: Zoltan HERPAI <wigyori@uid0.hu>
SVN-Revision: 39438

diff --git a/package/boot/uboot-sunxi/Makefile b/package/boot/uboot-sunxi/Makefile
index cedf2c454ba1d328061989790a56dbf38712ce0e..796a6045ccef494c7d6cfa20c7669cc1a52571f1 100644 (file)
--- a/package/boot/uboot-sunxi/Makefile
+++ b/package/boot/uboot-sunxi/Makefile
@@ -98,9 +98,11 @@ define Package/uboot/install/default
        $(CP) $(PKG_BUILD_DIR)/u-boot.bin \
                $(BIN_DIR)/uboot-$(BOARD)-$(1)/openwrt-$(BOARD)-$(1)-u-boot.bin
        $(CP) $(PKG_BUILD_DIR)/spl/sunxi-spl.bin \
-               $(BIN_DIR)/uboot-$(BOARD)-$(1)/openwrt-$(BOARD)-$(1)-sunxi-spl.bin
+               $(BIN_DIR)/uboot-$(BOARD)-$(1)/openwrt-$(BOARD)-$(1)-spl.bin
        $(CP) $(PKG_BUILD_DIR)/u-boot-sunxi-with-spl.bin \
-               $(BIN_DIR)/uboot-$(BOARD)-$(1)/openwrt-$(BOARD)-$(1)-sunxi-with-spl.bin
+               $(BIN_DIR)/uboot-$(BOARD)-$(1)/openwrt-$(BOARD)-$(1)-u-boot-with-spl.bin
+       $(CP) uEnv.txt \
+               $(BIN_DIR)/uboot-$(BOARD)-$(1)/openwrt-$(BOARD)-$(1)-uEnv.txt
 endef
 
 define Package/uboot/install/template

diff --git a/package/boot/uboot-sunxi/uEnv.txt b/package/boot/uboot-sunxi/uEnv.txt
new file mode 100644 (file)
index 0000000..e4fc0e1
--- /dev/null
+++ b/package/boot/uboot-sunxi/uEnv.txt
@@ -0,0 +1,5 @@
+fdt_high=ffffffff
+loadkernel=fatload mmc 0 0x46000000 uImage
+loaddtb=fatload mmc 0 0x49000000 dtb
+bootargs=console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p2 rootwait
+uenvcmd=run loadkernel && run loaddtb && bootm 0x46000000 - 0x49000000

diff --git a/target/linux/sunxi/config-3.12 b/target/linux/sunxi/config-3.12
index b57168b2d8ac6205194165a68f14002aa90a869e..d24d1c209255eba505efb885e2624e9e4dbb2a80 100644 (file)
--- a/target/linux/sunxi/config-3.12
+++ b/target/linux/sunxi/config-3.12
@@ -67,7 +67,7 @@ CONFIG_CLKSRC_MMIO=y
 CONFIG_CLKSRC_OF=y
 CONFIG_CLONE_BACKWARDS=y
 CONFIG_CMDLINE="console=ttyS0,115200 earlyprintk rootwait root=/dev/mmcblk0p2"
-CONFIG_CMDLINE_FORCE=y
+# CONFIG_CMDLINE_FORCE is not set
 CONFIG_COMMON_CLK=y
 CONFIG_COMPACTION=y
 CONFIG_CONFIGFS_FS=y