diff options
| author | Zoltan Herpai <wigyori@uid0.hu> | 2014-01-31 15:53:53 +0000 |
|---|---|---|
| committer | Zoltan Herpai <wigyori@uid0.hu> | 2014-01-31 15:53:53 +0000 |
| commit | 16cbe62e9cd6894ca926d28efaa20549a971d4bc (patch) | |
| tree | 1d8edca7c8e8cace76b3e02dac3892bb8fbe48e4 | |
| parent | 6ae1433ab91bc48f9a47920705d1866be8cadb9e (diff) | |
| download | upstream-16cbe62e9cd6894ca926d28efaa20549a971d4bc.tar.gz upstream-16cbe62e9cd6894ca926d28efaa20549a971d4bc.tar.bz2 upstream-16cbe62e9cd6894ca926d28efaa20549a971d4bc.zip | |
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 <zalan.blenessy@gmail.com>
Signed-off-by: Zoltan HERPAI <wigyori@uid0.hu>
SVN-Revision: 39438
| -rw-r--r-- | package/boot/uboot-sunxi/Makefile | 6 | ||||
| -rw-r--r-- | package/boot/uboot-sunxi/uEnv.txt | 5 | ||||
| -rw-r--r-- | target/linux/sunxi/config-3.12 | 2 |
3 files changed, 10 insertions, 3 deletions
diff --git a/package/boot/uboot-sunxi/Makefile b/package/boot/uboot-sunxi/Makefile index cedf2c454b..796a6045cc 100644 --- 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 index 0000000000..e4fc0e19bf --- /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 b57168b2d8..d24d1c2092 100644 --- 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 |