diff options
| author | Andre Heider <a.heider@gmail.com> | 2019-09-06 22:53:23 +0200 |
|---|---|---|
| committer | Alexander Couzens <lynxis@fe80.eu> | 2019-11-20 10:46:19 +0100 |
| commit | 1f37b2226ed3f5142906cdabd50e94d77e30505b (patch) | |
| tree | f698846e6c2b8d4cf10e7e345317e37fa85d683f | |
| parent | b69df1eee0eb4618355d5ea4d0cdb4553475c4b7 (diff) | |
| download | upstream-1f37b2226ed3f5142906cdabd50e94d77e30505b.tar.gz upstream-1f37b2226ed3f5142906cdabd50e94d77e30505b.tar.bz2 upstream-1f37b2226ed3f5142906cdabd50e94d77e30505b.zip | |
omap: switch from uEnv.txt to generic distro booting
Which makes supporting different boot devices easy.
Signed-off-by: Andre Heider <a.heider@gmail.com>
| -rw-r--r-- | package/boot/uboot-omap/Makefile | 4 | ||||
| -rw-r--r-- | package/boot/uboot-omap/files/boot.scr.txt | 5 | ||||
| -rw-r--r-- | package/boot/uboot-omap/files/uEnv-default.txt | 8 | ||||
| -rw-r--r-- | target/linux/omap/image/Makefile | 2 |
4 files changed, 8 insertions, 11 deletions
diff --git a/package/boot/uboot-omap/Makefile b/package/boot/uboot-omap/Makefile index b519d6fb80..70c8af1dc4 100644 --- a/package/boot/uboot-omap/Makefile +++ b/package/boot/uboot-omap/Makefile @@ -19,7 +19,6 @@ include $(INCLUDE_DIR)/package.mk define U-Boot/Default BUILD_TARGET:=omap UBOOT_IMAGE:=u-boot.img MLO - UENV:=default endef define U-Boot/omap4_panda @@ -51,7 +50,8 @@ define Build/InstallDev $(CP) $(patsubst %,$(PKG_BUILD_DIR)/%,$(UBOOT_IMAGE)) $(STAGING_DIR_IMAGE)/$(device)/ ) $(foreach device,$(BUILD_DEVICES), \ - $(CP) ./files/uEnv-$(UENV).txt $(STAGING_DIR_IMAGE)/$(device)/uEnv.txt + mkimage -C none -A arm -T script -d ./files/boot.scr.txt \ + $(STAGING_DIR_IMAGE)/$(device)/boot.scr ) endef diff --git a/package/boot/uboot-omap/files/boot.scr.txt b/package/boot/uboot-omap/files/boot.scr.txt new file mode 100644 index 0000000000..3e6b5c351d --- /dev/null +++ b/package/boot/uboot-omap/files/boot.scr.txt @@ -0,0 +1,5 @@ +setenv bootargs console=${console} root=/dev/mmcblk0p2 rootwait + +load mmc 0:1 ${loadaddr} /zImage \ +&& load mmc 0:1 ${fdtaddr} /dtbs/${fdtfile} \ +&& bootz ${loadaddr} - ${fdtaddr} diff --git a/package/boot/uboot-omap/files/uEnv-default.txt b/package/boot/uboot-omap/files/uEnv-default.txt deleted file mode 100644 index 8dc80e7b09..0000000000 --- a/package/boot/uboot-omap/files/uEnv-default.txt +++ /dev/null @@ -1,8 +0,0 @@ -bootpart=0:1 -bootdir=/ -bootfile=zImage -fdtdir=/dtbs -uenvcmd=run loadfdt; run loadimage; run uenvbootargs ; bootz ${loadaddr} - ${fdtaddr} -loadfdt=load mmc ${bootpart} ${fdtaddr} ${fdtdir}/${fdtfile} -devtype=mmc -uenvbootargs=setenv bootargs console=${console} root=/dev/mmcblk0p2 rootwait diff --git a/target/linux/omap/image/Makefile b/target/linux/omap/image/Makefile index ce3ad9ddf0..106071a38e 100644 --- a/target/linux/omap/image/Makefile +++ b/target/linux/omap/image/Makefile @@ -19,7 +19,7 @@ define Build/omap-sdcard mcopy -i $@.boot $(STAGING_DIR_IMAGE)/$(DEVICE_NAME)/MLO ::MLO mcopy -i $@.boot $(STAGING_DIR_IMAGE)/$(DEVICE_NAME)/u-boot.img ::u-boot.img - mcopy -i $@.boot $(STAGING_DIR_IMAGE)/$(DEVICE_NAME)/uEnv.txt ::uEnv.txt + mcopy -i $@.boot $(STAGING_DIR_IMAGE)/$(DEVICE_NAME)/boot.scr ::boot.scr mmd -i $@.boot ::/dtbs mcopy -i $@.boot $(DTS_DIR)/$(DEVICE_DTS).dtb ::/dtbs/$(DEVICE_DTS).dtb mcopy -i $@.boot $(IMAGE_KERNEL) ::/zImage |