sunxi: boot changes - Added uEnv.txt to facilitate automatic boot. - Cosmetic fix in u-boot Makefile - Don't force command line arguments

Signed-off-by: Zalan Blenessy <[email protected]>
Signed-off-by: Zoltan HERPAI <[email protected]>

SVN-Revision: 39438

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

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

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