From 5f74bc322f52d244a7f1856c28d51120ff46349c Mon Sep 17 00:00:00 2001 From: Gottox Date: Wed, 22 Jan 2014 00:23:49 +0100 Subject: [PATCH 1/2] Adding odroid-u2-ubootcfg --- .../files/boot-1024x768-noedid.txt | 7 ++++++ .../files/boot-1080p-edid.txt | 7 ++++++ .../files/boot-1080p-noedid.txt | 8 ++++++ .../files/boot-720p-edid.txt | 8 ++++++ .../files/boot-720p-noedid.txt | 7 ++++++ .../files/boot-auto_edid.txt | 7 ++++++ srcpkgs/odroid-u2-ubootcfg/template | 25 +++++++++++++++++++ 7 files changed, 69 insertions(+) create mode 100644 srcpkgs/odroid-u2-ubootcfg/files/boot-1024x768-noedid.txt create mode 100644 srcpkgs/odroid-u2-ubootcfg/files/boot-1080p-edid.txt create mode 100644 srcpkgs/odroid-u2-ubootcfg/files/boot-1080p-noedid.txt create mode 100644 srcpkgs/odroid-u2-ubootcfg/files/boot-720p-edid.txt create mode 100644 srcpkgs/odroid-u2-ubootcfg/files/boot-720p-noedid.txt create mode 100644 srcpkgs/odroid-u2-ubootcfg/files/boot-auto_edid.txt create mode 100644 srcpkgs/odroid-u2-ubootcfg/template diff --git a/srcpkgs/odroid-u2-ubootcfg/files/boot-1024x768-noedid.txt b/srcpkgs/odroid-u2-ubootcfg/files/boot-1024x768-noedid.txt new file mode 100644 index 00000000000..b85c0785195 --- /dev/null +++ b/srcpkgs/odroid-u2-ubootcfg/files/boot-1024x768-noedid.txt @@ -0,0 +1,7 @@ +X-1024x768-edid +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 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.txt new file mode 100644 index 00000000000..3dc78f31934 --- /dev/null +++ b/srcpkgs/odroid-u2-ubootcfg/files/boot-1080p-edid.txt @@ -0,0 +1,7 @@ +boot.scr 1080p +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 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.txt new file mode 100644 index 00000000000..873e77b368f --- /dev/null +++ b/srcpkgs/odroid-u2-ubootcfg/files/boot-1080p-noedid.txt @@ -0,0 +1,8 @@ +aPCR +X-1080p-noedid +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 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.txt new file mode 100644 index 00000000000..6a728a66f03 --- /dev/null +++ b/srcpkgs/odroid-u2-ubootcfg/files/boot-720p-edid.txt @@ -0,0 +1,8 @@ +R}-o +boot.scr for X with HDMI auto-pr +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 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.txt new file mode 100644 index 00000000000..c69caaf4ba5 --- /dev/null +++ b/srcpkgs/odroid-u2-ubootcfg/files/boot-720p-noedid.txt @@ -0,0 +1,7 @@ +X-720p-noedid +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 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.txt b/srcpkgs/odroid-u2-ubootcfg/files/boot-auto_edid.txt new file mode 100644 index 00000000000..91ac930741d --- /dev/null +++ b/srcpkgs/odroid-u2-ubootcfg/files/boot-auto_edid.txt @@ -0,0 +1,7 @@ +7R}-> +boot.scr for X with HDMI auto-pr +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 new file mode 100644 index 00000000000..c235b56d493 --- /dev/null +++ b/srcpkgs/odroid-u2-ubootcfg/template @@ -0,0 +1,25 @@ +# Template file for 'odroid-u2-bootcfg' +pkgname=odroid-u2-ubootcfg +version=1.0 +revision=1 +homepage="http://hardkernel.com" +hostmakedepends="uboot-mkimage" +short_desc="odroid u2/u3 boot configuration" +maintainer="Enno Boland " +license="GPL-2.0" + +_default_scr="boot-auto_edid.scr" + +do_build() { + for source in ${FILESDIR}/*.txt; do + mkimage -A arm -T script -C none -d $source $(basename ${source/.txt/.scr}) + done + cp ${_default_scr} boot.scr +} + +do_install() { + for scr in *.scr; do + echo $scr + vinstall $scr 600 boot + done +} From b92c7a97495d0b16c72022c8ce8d41cc180ad1c5 Mon Sep 17 00:00:00 2001 From: Gottox Date: Wed, 22 Jan 2014 00:52:08 +0100 Subject: [PATCH 2/2] [odroid-u2-ubootcfg] fixing garbage text in configs --- srcpkgs/odroid-u2-ubootcfg/files/boot-1024x768-noedid.txt | 1 - srcpkgs/odroid-u2-ubootcfg/files/boot-1080p-edid.txt | 1 - srcpkgs/odroid-u2-ubootcfg/files/boot-1080p-noedid.txt | 2 -- srcpkgs/odroid-u2-ubootcfg/files/boot-720p-edid.txt | 2 -- srcpkgs/odroid-u2-ubootcfg/files/boot-720p-noedid.txt | 1 - srcpkgs/odroid-u2-ubootcfg/files/boot-auto_edid.txt | 2 -- srcpkgs/odroid-u2-ubootcfg/template | 3 ++- 7 files changed, 2 insertions(+), 10 deletions(-) diff --git a/srcpkgs/odroid-u2-ubootcfg/files/boot-1024x768-noedid.txt b/srcpkgs/odroid-u2-ubootcfg/files/boot-1024x768-noedid.txt index b85c0785195..8c1909aefca 100644 --- a/srcpkgs/odroid-u2-ubootcfg/files/boot-1024x768-noedid.txt +++ b/srcpkgs/odroid-u2-ubootcfg/files/boot-1024x768-noedid.txt @@ -1,4 +1,3 @@ -X-1024x768-edid 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" diff --git a/srcpkgs/odroid-u2-ubootcfg/files/boot-1080p-edid.txt b/srcpkgs/odroid-u2-ubootcfg/files/boot-1080p-edid.txt index 3dc78f31934..0b381679d87 100644 --- a/srcpkgs/odroid-u2-ubootcfg/files/boot-1080p-edid.txt +++ b/srcpkgs/odroid-u2-ubootcfg/files/boot-1080p-edid.txt @@ -1,4 +1,3 @@ -boot.scr 1080p setenv initrd_high "0xffffffff" setenv fdt_high "0xffffffff" setenv drm_video_mode "HDMI-A-1:1920x1080@60" diff --git a/srcpkgs/odroid-u2-ubootcfg/files/boot-1080p-noedid.txt b/srcpkgs/odroid-u2-ubootcfg/files/boot-1080p-noedid.txt index 873e77b368f..48d3c45c721 100644 --- a/srcpkgs/odroid-u2-ubootcfg/files/boot-1080p-noedid.txt +++ b/srcpkgs/odroid-u2-ubootcfg/files/boot-1080p-noedid.txt @@ -1,5 +1,3 @@ -aPCR -X-1080p-noedid 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" diff --git a/srcpkgs/odroid-u2-ubootcfg/files/boot-720p-edid.txt b/srcpkgs/odroid-u2-ubootcfg/files/boot-720p-edid.txt index 6a728a66f03..7e798659f8e 100644 --- a/srcpkgs/odroid-u2-ubootcfg/files/boot-720p-edid.txt +++ b/srcpkgs/odroid-u2-ubootcfg/files/boot-720p-edid.txt @@ -1,5 +1,3 @@ -R}-o -boot.scr for X with HDMI auto-pr setenv initrd_high "0xffffffff" setenv fdt_high "0xffffffff" setenv drm_video_mode "HDMI-A-1:1280x720M@60" diff --git a/srcpkgs/odroid-u2-ubootcfg/files/boot-720p-noedid.txt b/srcpkgs/odroid-u2-ubootcfg/files/boot-720p-noedid.txt index c69caaf4ba5..3e5db2abe77 100644 --- a/srcpkgs/odroid-u2-ubootcfg/files/boot-720p-noedid.txt +++ b/srcpkgs/odroid-u2-ubootcfg/files/boot-720p-noedid.txt @@ -1,4 +1,3 @@ -X-720p-noedid 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" diff --git a/srcpkgs/odroid-u2-ubootcfg/files/boot-auto_edid.txt b/srcpkgs/odroid-u2-ubootcfg/files/boot-auto_edid.txt index 91ac930741d..ea48cc74e95 100644 --- a/srcpkgs/odroid-u2-ubootcfg/files/boot-auto_edid.txt +++ b/srcpkgs/odroid-u2-ubootcfg/files/boot-auto_edid.txt @@ -1,5 +1,3 @@ -7R}-> -boot.scr for X with HDMI auto-pr 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" diff --git a/srcpkgs/odroid-u2-ubootcfg/template b/srcpkgs/odroid-u2-ubootcfg/template index c235b56d493..d75577811a7 100644 --- a/srcpkgs/odroid-u2-ubootcfg/template +++ b/srcpkgs/odroid-u2-ubootcfg/template @@ -12,7 +12,8 @@ _default_scr="boot-auto_edid.scr" do_build() { for source in ${FILESDIR}/*.txt; do - mkimage -A arm -T script -C none -d $source $(basename ${source/.txt/.scr}) + name=$(basename ${source%.txt}) + mkimage -A arm -T script -C none -n "${name}" -d $source ${name}.scr done cp ${_default_scr} boot.scr }