ExternalVendorCode/openwrt
1
0
Fork 0
mirror of https://github.com/openwrt/openwrt.git synced 2024-12-19 05:38:00 +00:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

omap: switch from uEnv.txt to generic distro booting

Browse Source 
Which makes supporting different boot devices easy.

Signed-off-by: Andre Heider <a.heider@gmail.com>
This commit is contained in:
Andre Heider 2019-09-06 22:53:23 +02:00 committed by Alexander Couzens
parent b69df1eee0
commit 1f37b2226e
4 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
package/boot/uboot-omap/Makefile
View File

@ -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

5
package/boot/uboot-omap/files/boot.scr.txt Normal file
View File

@ -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}

8
package/boot/uboot-omap/files/uEnv-default.txt
View File

@ -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

2
target/linux/omap/image/Makefile
View File

@ -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