From: Marek Szyprowski Date: Tue, 26 Mar 2024 23:09:51 +0000 (+0100) Subject: Revert "tizen: Add extlinux.conf file to boot Tizen" X-Git-Tag: accepted/tizen/unified/x/20240328.131010^0 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=9c52849a401acecb93b896aba0c9938e0d112bf4;p=platform%2Fkernel%2Flinux-thead.git Revert "tizen: Add extlinux.conf file to boot Tizen" This reverts commit e72a2f6fb82be2ff7252a172e66c1a153d409b2f. With adapted u-boot installed on SD-card a standard Tizen's boot.scr.uimg based booting is possible. Signed-off-by: Marek Szyprowski Change-Id: I336508b4ee08846d8079f3925817974383f9d865 --- diff --git a/packaging/linux-lpi4a.spec b/packaging/linux-lpi4a.spec index 1cca94053c31..9a195bd0445f 100644 --- a/packaging/linux-lpi4a.spec +++ b/packaging/linux-lpi4a.spec @@ -121,7 +121,6 @@ mkdir -p %{buildroot}/lib/modules # Install kernel DTB install -m 644 arch/%{buildarch}/boot/dts/thead/th1520*.dtb %{buildroot}/boot/ -install -m 644 tizen/extlinux.conf %{buildroot}/boot/ mkdir -p %{buildroot}/boot/overlays # Install kernel headers @@ -180,7 +179,6 @@ rm -rf %{buildroot} %license COPYING /boot/Image /boot/th1520*.dtb -/boot/extlinux.conf %files -n %{variant}-linux-kernel-headers /usr/include/* diff --git a/tizen/extlinux.conf b/tizen/extlinux.conf deleted file mode 100644 index 26b4b12cfaad..000000000000 --- a/tizen/extlinux.conf +++ /dev/null @@ -1,35 +0,0 @@ -default 21 -menu title U-Boot menu -prompt 2 -timeout 50 - -label l0 - menu label RevyOS GNU/Linux 5.10.113-lpi4a (HDMI only) - linux /Image - fdtdir /dtbs/linux-image-5.10.113-lpi4a/ - append root=/dev/mmcblk0p3 console=ttyS0,115200 rootwait rw earlycon clk_ignore_unused loglevel=7 eth= rootrwoptions=rw,noatime rootrwreset=yes - -label l1 - menu label RevyOS GNU/Linux 5.10.113-lpi4a (HDMI and MIPI) - linux /Image - fdtdir /dtbs/linux-image-5.10.113-lpi4a/dual - append root=/dev/mmcblk0p3 console=ttyS0,115200 rootwait rw earlycon clk_ignore_unused loglevel=7 eth= rootrwoptions=rw,noatime rootrwreset=yes - -label l0r - menu label RevyOS GNU/Linux 5.10.113-lpi4a (rescue target) - linux /vmlinux-5.10.113-lpi4a - initrd /initrd.img-5.10.113-lpi4a - fdtdir /dtbs/linux-image-5.10.113-lpi4a/ - append root=/dev/mmcblk0p3 console=ttyS0,115200 rootwait rw earlycon clk_ignore_unused loglevel=7 eth= rootrwoptions=rw,noatime rootrwreset=yes single - -label 20 - menu label Tizen OS GNU/Linux v5.10.113 - linux /Image - fdtdir /dtbs/linux-image-5.10.113-lpi4a/ - append root=/dev/mmcblk1p7 console=ttyS0,115200 rootwait rw earlycon clk_ignore_unused loglevel=7 eth= rootrwoptions=rw,noatime rootrwreset=yes - -label 21 - menu label Tizen OS GNU/Linux v6.6.20 - linux /Image - fdtdir / - append root=/dev/mmcblk1p7 console=ttyS0,115200 rootwait rw earlycon clk_ignore_unused loglevel=7 eth= rootrwoptions=rw,noatime rootrwreset=yes