diff --git a/srcpkgs/odroid-u2-ubootcfg/files/boot-1024x768-noedid.txt b/srcpkgs/odroid-u2-ubootcfg/files/boot-1024x768-noedid.ini similarity index 67% rename from srcpkgs/odroid-u2-ubootcfg/files/boot-1024x768-noedid.txt rename to srcpkgs/odroid-u2-ubootcfg/files/boot-1024x768-noedid.ini index 8c1909aefc..f04278a8f8 100644 --- a/srcpkgs/odroid-u2-ubootcfg/files/boot-1024x768-noedid.txt +++ b/srcpkgs/odroid-u2-ubootcfg/files/boot-1024x768-noedid.ini @@ -1,6 +1,6 @@ setenv initrd_high "0xffffffff" setenv fdt_high "0xffffffff" -setenv bootcmd "fatload mmc 0:1 0x40008000 zImage; fatload mmc 0:1 0x42000000 uInitrd; bootm 0x40008000 0x42000000" +setenv bootcmd "fatload mmc 0:1 0x40008000 /zImage; bootm 0x40008000" setenv edid_load "drm_kms_helper.edid_firmware=edid/1024x768.bin" setenv bootargs "console=tty1 console=ttySAC1,115200n8 ${edid_load} root=/dev/mmcblk0p2 rootwait ro mem=2047M" boot diff --git a/srcpkgs/odroid-u2-ubootcfg/files/boot-1080p-edid.txt b/srcpkgs/odroid-u2-ubootcfg/files/boot-1080p-edid.ini similarity index 66% rename from srcpkgs/odroid-u2-ubootcfg/files/boot-1080p-edid.txt rename to srcpkgs/odroid-u2-ubootcfg/files/boot-1080p-edid.ini index 0b381679d8..00feab1719 100644 --- a/srcpkgs/odroid-u2-ubootcfg/files/boot-1080p-edid.txt +++ b/srcpkgs/odroid-u2-ubootcfg/files/boot-1080p-edid.ini @@ -1,6 +1,6 @@ setenv initrd_high "0xffffffff" setenv fdt_high "0xffffffff" setenv drm_video_mode "HDMI-A-1:1920x1080@60" -setenv bootcmd "fatload mmc 0:1 0x40008000 zImage; fatload mmc 0:1 0x42000000 uInitrd; bootm 0x40008000 0x42000000" +setenv bootcmd "fatload mmc 0:1 0x40008000 /zImage; bootm 0x40008000" setenv bootargs "console=tty1 console=ttySAC1,115200n8 video=${drm_video_mode} root=/dev/mmcblk0p2 rootwait ro mem=2047M" boot diff --git a/srcpkgs/odroid-u2-ubootcfg/files/boot-1080p-noedid.txt b/srcpkgs/odroid-u2-ubootcfg/files/boot-1080p-noedid.ini similarity index 67% rename from srcpkgs/odroid-u2-ubootcfg/files/boot-1080p-noedid.txt rename to srcpkgs/odroid-u2-ubootcfg/files/boot-1080p-noedid.ini index 48d3c45c72..3b051d8596 100644 --- a/srcpkgs/odroid-u2-ubootcfg/files/boot-1080p-noedid.txt +++ b/srcpkgs/odroid-u2-ubootcfg/files/boot-1080p-noedid.ini @@ -1,6 +1,6 @@ setenv initrd_high "0xffffffff" setenv fdt_high "0xffffffff" -setenv bootcmd "fatload mmc 0:1 0x40008000 zImage; fatload mmc 0:1 0x42000000 uInitrd; bootm 0x40008000 0x42000000" +setenv bootcmd "fatload mmc 0:1 0x40008000 /zImage; bootm 0x40008000" setenv edid_load "drm_kms_helper.edid_firmware=edid/1920x1080.bin" setenv bootargs "console=tty1 console=ttySAC1,115200n8 ${edid_load} root=/dev/mmcblk0p2 rootwait ro mem=2047M" boot diff --git a/srcpkgs/odroid-u2-ubootcfg/files/boot-720p-edid.txt b/srcpkgs/odroid-u2-ubootcfg/files/boot-720p-edid.ini similarity index 66% rename from srcpkgs/odroid-u2-ubootcfg/files/boot-720p-edid.txt rename to srcpkgs/odroid-u2-ubootcfg/files/boot-720p-edid.ini index 7e798659f8..994a8cf080 100644 --- a/srcpkgs/odroid-u2-ubootcfg/files/boot-720p-edid.txt +++ b/srcpkgs/odroid-u2-ubootcfg/files/boot-720p-edid.ini @@ -1,6 +1,6 @@ setenv initrd_high "0xffffffff" setenv fdt_high "0xffffffff" setenv drm_video_mode "HDMI-A-1:1280x720M@60" -setenv bootcmd "fatload mmc 0:1 0x40008000 zImage; fatload mmc 0:1 0x42000000 uInitrd; bootm 0x40008000 0x42000000" +setenv bootcmd "fatload mmc 0:1 0x40008000 /zImage; bootm 0x40008000" setenv bootargs "console=tty1 console=ttySAC1,115200n8 video=${drm_video_mode} root=/dev/mmcblk0p2 rootwait ro mem=2047M" boot diff --git a/srcpkgs/odroid-u2-ubootcfg/files/boot-720p-noedid.txt b/srcpkgs/odroid-u2-ubootcfg/files/boot-720p-noedid.ini similarity index 67% rename from srcpkgs/odroid-u2-ubootcfg/files/boot-720p-noedid.txt rename to srcpkgs/odroid-u2-ubootcfg/files/boot-720p-noedid.ini index 3e5db2abe7..b8692e27d4 100644 --- a/srcpkgs/odroid-u2-ubootcfg/files/boot-720p-noedid.txt +++ b/srcpkgs/odroid-u2-ubootcfg/files/boot-720p-noedid.ini @@ -1,6 +1,6 @@ setenv initrd_high "0xffffffff" setenv fdt_high "0xffffffff" -setenv bootcmd "fatload mmc 0:1 0x40008000 zImage; fatload mmc 0:1 0x42000000 uInitrd; bootm 0x40008000 0x42000000" +setenv bootcmd "fatload mmc 0:1 0x40008000 /zImage; bootm 0x40008000" setenv edid_load "drm_kms_helper.edid_firmware=edid/1280x720.bin" setenv bootargs "console=tty1 console=ttySAC1,115200n8 ${edid_load} root=/dev/mmcblk0p2 rootwait ro mem=2047M" boot diff --git a/srcpkgs/odroid-u2-ubootcfg/files/boot-auto_edid.ini b/srcpkgs/odroid-u2-ubootcfg/files/boot-auto_edid.ini new file mode 100644 index 0000000000..914df3d5e5 --- /dev/null +++ b/srcpkgs/odroid-u2-ubootcfg/files/boot-auto_edid.ini @@ -0,0 +1,5 @@ +setenv initrd_high "0xffffffff" +setenv fdt_high "0xffffffff" +setenv bootcmd "fatload mmc 0:1 0x40008000 zImage; bootm 0x40008000" +setenv bootargs "console=tty1 console=ttySAC1,115200n8 root=root=/dev/mmcblk0p2 rootwait ro mem=2047M" +boot diff --git a/srcpkgs/odroid-u2-ubootcfg/files/boot-auto_edid.txt b/srcpkgs/odroid-u2-ubootcfg/files/boot-auto_edid.txt deleted file mode 100644 index ea48cc74e9..0000000000 --- a/srcpkgs/odroid-u2-ubootcfg/files/boot-auto_edid.txt +++ /dev/null @@ -1,5 +0,0 @@ -setenv initrd_high "0xffffffff" -setenv fdt_high "0xffffffff" -setenv bootcmd "fatload mmc 0:1 0x40008000 zImage; fatload mmc 0:1 0x42000000 uInitrd; bootm 0x40008000 0x42000000" -setenv bootargs "console=tty1 console=ttySAC1,115200n8 root=/dev/mmcblk0p2 rootwait ro mem=2047M" -boot diff --git a/srcpkgs/odroid-u2-ubootcfg/template b/srcpkgs/odroid-u2-ubootcfg/template index d75577811a..5721c68500 100644 --- a/srcpkgs/odroid-u2-ubootcfg/template +++ b/srcpkgs/odroid-u2-ubootcfg/template @@ -1,7 +1,7 @@ # Template file for 'odroid-u2-bootcfg' pkgname=odroid-u2-ubootcfg version=1.0 -revision=1 +revision=2 homepage="http://hardkernel.com" hostmakedepends="uboot-mkimage" short_desc="odroid u2/u3 boot configuration" @@ -11,8 +11,8 @@ license="GPL-2.0" _default_scr="boot-auto_edid.scr" do_build() { - for source in ${FILESDIR}/*.txt; do - name=$(basename ${source%.txt}) + for source in ${FILESDIR}/*.ini; do + name=$(basename ${source%.ini}) mkimage -A arm -T script -C none -n "${name}" -d $source ${name}.scr done cp ${_default_scr} boot.scr