From 8dba71dd33c8e35e7f363ffdb2ba42259ab43ce2 Mon Sep 17 00:00:00 2001 From: Piotr Dymacz Date: Wed, 26 May 2021 12:36:30 +0200 Subject: imx6: image: drop BOOT_SCRIPT and fix DEVICE_NAME This fixes Gateworks Ventana 'DEVICE_NAME' variable which value wasn't adjusted during migration to common 'vendor_model' image naming scheme (fixes: FS#3825). Furthermore, drop unused 'Build/boot-scr' recipe, get rid of redundant 'BOOT_SCRIPT' variable (use already provided 'DEVICE_NAME' instead) and drop custom 'DEVICE_NAME' variable from SolidRun CuBox-i image recipe (use default one instead). Fixes: cbc8bcfbaa ("imx6: image: use vendor_model scheme") Signed-off-by: Piotr Dymacz --- target/linux/imx6/image/bootscript-solidrun_cubox | 31 ----------------------- 1 file changed, 31 deletions(-) delete mode 100644 target/linux/imx6/image/bootscript-solidrun_cubox (limited to 'target/linux/imx6/image/bootscript-solidrun_cubox') diff --git a/target/linux/imx6/image/bootscript-solidrun_cubox b/target/linux/imx6/image/bootscript-solidrun_cubox deleted file mode 100644 index 2ed48ab9415..00000000000 --- a/target/linux/imx6/image/bootscript-solidrun_cubox +++ /dev/null @@ -1,31 +0,0 @@ -echo "CuBox OpenWrt Boot script" - -# Set console variable for both UART and HDMI -setenv console console=ttymxc0,115200 video=mxcfb0:dev=hdmi,1920x1080M@60,if=RGB24,bpp=32 - -# Find correct dtb -if test ${board_rev} = MX6DL; then - setenv fdt_soc_type imx6dl; -elif test ${board_rev} = MX6Q; then - setenv fdt_soc_type imx6q; -fi -if test ${board_name} = CUBOXI; then - setenv fdt_name ${fdt_soc_type}-cubox-i.dtb; -elif test ${board_name} = HUMMINGBOARD; then - setenv fdt_name ${fdt_soc_type}-hummingboard.dtb; -fi - -# Set correct devtype and partition -if test ${devtype} != mmc; then setenv devtype mmc; fi -if mmc dev 0; then - setenv mmcdev 0 -elif mmc dev 1; then - setenv mmcdev 1 -fi - -# Boot from the SD card is supported at the moment -setenv bootargs "${console} root=/dev/mmcblk1p2 rw rootwait" -mmc dev ${mmcdev} -load ${devtype} ${mmcdev}:${devplist} ${kernel_addr_r} /uImage -load ${devtype} ${mmcdev}:${devplist} ${fdt_addr_r} /${fdt_name} -bootz ${kernel_addr_r} - ${fdt_addr_r} -- cgit v1.2.3