From 8a070a779f7a46b0b03d70066fb3511021895342 Mon Sep 17 00:00:00 2001 From: zador-blood-stained Date: Thu, 13 Oct 2016 21:10:17 +0300 Subject: [PATCH] Odroid C1 single partition images (untested) --- config/bootscripts/boot-odroid-c1.ini | 8 ++++---- config/sources/odroidc1.conf | 1 - .../ext4-boot-improvements.patch | 15 +++++++++++++++ 3 files changed, 19 insertions(+), 5 deletions(-) create mode 100644 patch/u-boot/u-boot-odroidc1-default/ext4-boot-improvements.patch diff --git a/config/bootscripts/boot-odroid-c1.ini b/config/bootscripts/boot-odroid-c1.ini index a6c6c7012f..818d45ba76 100644 --- a/config/bootscripts/boot-odroid-c1.ini +++ b/config/bootscripts/boot-odroid-c1.ini @@ -1,6 +1,6 @@ ODROIDC-UBOOT-CONFIG -setenv rootdev "/dev/mmcblk0p2" +setenv rootdev "/dev/mmcblk0p1" # Possible screen resolutions # Uncomment only a single Line! The line with setenv written. @@ -83,9 +83,9 @@ if test "${cec}" = "1"; then setenv hdmi_cec "hdmitx=cecf"; fi setenv bootargs "root=${rootdev} rootwait ro ${condev} loglevel=1 no_console_suspend vdaccfg=0xa000 logo=osd1,loaded,0x7900000,720p,full dmfc=3 cvbsmode=576cvbs hdmimode=${m} m_bpp=${m_bpp} vout=${vout_mode} ${disableuhs} ${hdmi_hpd} ${hdmi_cec} ${enabledac} ${extraargs}" # Booting -fatload mmc 0:1 0x21000000 uImage -fatload mmc 0:1 0x22000000 uInitrd -fatload mmc 0:1 0x21800000 dtb/meson8b_odroidc.dtb +ext4load mmc 0:1 0x21000000 /boot/uImage || fatload mmc 0:1 0x21000000 uImage || ext4load mmc 0:1 0x21000000 uImage +ext4load mmc 0:1 0x22000000 /boot/uInitrd || fatload mmc 0:1 0x22000000 uInitrd || ext4load mmc 0:1 0x22000000 uInitrd +ext4load mmc 0:1 0x21800000 /boot/dtb/meson8b_odroidc.dtb || fatload mmc 0:1 0x21800000 dtb/meson8b_odroidc.dtb || ext4load mmc 0:1 0x21800000 dtb/meson8b_odroidc.dtb fdt addr 21800000 if test "${vpu}" = "0"; then fdt rm /mesonstream; fdt rm /vdec; fdt rm /ppmgr; fi diff --git a/config/sources/odroidc1.conf b/config/sources/odroidc1.conf index 9e58ac87fa..35cae9dd04 100644 --- a/config/sources/odroidc1.conf +++ b/config/sources/odroidc1.conf @@ -3,7 +3,6 @@ BOOTSOURCE='https://github.com/hardkernel/u-boot.git' BOOTBRANCH='branch:odroidc-v2011.03' BOOTDIR='u-boot-odroidc1' UBOOT_NEEDS_GCC='< 4.9' -BOOTSIZE=32 BOOTSCRIPT="boot-odroid-c1.ini:boot.ini" KERNEL_NEEDS_GCC='< 4.9' diff --git a/patch/u-boot/u-boot-odroidc1-default/ext4-boot-improvements.patch b/patch/u-boot/u-boot-odroidc1-default/ext4-boot-improvements.patch new file mode 100644 index 0000000000..965a20ad80 --- /dev/null +++ b/patch/u-boot/u-boot-odroidc1-default/ext4-boot-improvements.patch @@ -0,0 +1,15 @@ +diff --git a/board/hardkernel/odroidc/cfgload.c b/board/hardkernel/odroidc/cfgload.c +index cbe1871..36c06e3 100644 +--- a/board/hardkernel/odroidc/cfgload.c ++++ b/board/hardkernel/odroidc/cfgload.c +@@ -33,8 +33,8 @@ static char *load_cmd = + " then echo Loading boot.ini from mmc0:1 (vfat);" + " else if ext4load mmc 0:1 $loadaddr /boot/boot.ini;" + " then echo Loading boot.ini from mmc0:1 (ext4);" +- " else if ext4load mmc 0:2 $loadaddr /boot/boot.ini;" +- " then echo Loading boot.init from mmc0:2 (ext4);" ++ " else if ext4load mmc 0:1 $loadaddr boot.ini;" ++ " then echo Loading boot.ini from mmc0:1 (ext4);" + " fi;fi;fi"; + + int do_fat_cfgload(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])