Fix odroidc1 (#1932)

* enable and change odroidc1 config
remove EOS
enable current and dev config
meson-current: update config
meson-dev: update config
Signed-off-by: Dirk Neukirchen <plntyk.arm@plntyk.name>

* meson-current meson-dev: reduce Kernel size

with default loading locations in u-boot
the uImage can be too large and will be partly overwritten
with the loaded dtb leading to boot failues due to wrong checksum

Signed-off-by: Dirk Neukirchen <plntyk.arm@plntyk.name>

* odroid-c1: change default loglevel

Signed-off-by: Dirk Neukirchen <plntyk.arm@plntyk.name>

* meson: fix odroidc1 boot and create uImage

without uImage the board will not boot
take the already used hack (?) from
general-kernel-odroidn2-current.patch
since KERNEL_IMAGE_TYPE does not work as expected

Signed-off-by: Dirk Neukirchen <plntyk.arm@plntyk.name>

* Update targets.conf

* Update targets.conf

* Update targets.conf

* Making a bigger diff

* Removing build_minimal

One can choose what to build, while build targets are defined elsewhere

* Governor interactive n/a

* Updating config

Cause of changes in boot.ini we don't need to worry about size. After few tests, no problems sighted.

Tested running Docker.

* Adjust dev config too

Tested.

* Update odroidc1.conf

Co-authored-by: Igor Pečovnik <igorpecovnik@users.noreply.github.com>

config/boards/odroidc1.conf

@@ -1,5 +1,6 @@
-# S805 C1 quad core
+# S805 C1 quad core 1GB RAM SoC GBE
 BOARD_NAME="Odroid C1"
 BOARDFAMILY="meson8b"
 BOOTCONFIG="odroidc_config"
 KERNEL_TARGET="current,dev"
+BUILD_DESKTOP=no

config/bootscripts/boot-odroid-c1.ini

@@ -93,10 +93,10 @@ if test "${cec}" = "1"; then setenv hdmi_cec "hdmitx=cecf"; fi
 if test "${disable_vu7}" = "false"; then setenv hid_quirks "usbhid.quirks=0x0eef:0x0005:0x0004"; fi
 
 # Boot Arguments
-setenv bootargs "root=${rootdev} rootwait rw ${condev} rootfstype=${rootfstype} loglevel=3 no_console_suspend consoleblank=0 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} monitor_onoff=${monitor_onoff} max_freq=${max_freq} ${hid_quirks} ${extraargs}"
+setenv bootargs "root=${rootdev} rootwait rw ${condev} rootfstype=${rootfstype} loglevel=7 no_console_suspend consoleblank=0 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} monitor_onoff=${monitor_onoff} max_freq=${max_freq} ${hid_quirks} ${extraargs}"
 
 # Booting
-ext4load mmc 0:1 0x21000000 /boot/uImage || fatload mmc 0:1 0x21000000 uImage || ext4load mmc 0:1 0x21000000 uImage
+ext4load mmc 0:1 0x20800000 /boot/uImage || fatload mmc 0:1 0x20800000 uImage || ext4load mmc 0:1 0x20800000 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
 # mainline kernel
@@ -106,4 +106,4 @@ fdt addr 21800000
 if test "${vpu}" = "0"; then fdt rm /mesonstream; fdt rm /vdec; fdt rm /ppmgr; fi
 if test "${hdmioutput}" = "0"; then fdt rm /mesonfb; fi
 
-bootm 0x21000000 0x22000000 0x21800000
+bootm 0x20800000 0x22000000 0x21800000

config/kernel/linux-meson-dev.config

@@ -1 +0,0 @@
-linux-meson-current.config

config/sources/families/include/meson_common.inc

@@ -10,7 +10,22 @@ KERNEL_IMAGE_TYPE=uImage
 LINUXFAMILY=meson
 CPUMIN=504000
 CPUMAX=1632000
-GOVERNOR=interactive
+GOVERNOR=ondemand
+
+case $BRANCH in
+	current)
+
+		KERNELBRANCH="branch:linux-5.4.y"
+		KERNELPATCHDIR='meson-'$BRANCH
+
+	;;
+	dev)
+
+		KERNELBRANCH="branch:linux-5.6.y"
+		KERNELPATCHDIR='meson-'$BRANCH
+
+	;;
+esac
 
 write_uboot_platform()
 {

config/targets.conf

@@ -429,8 +429,10 @@ nanopia64			dev			focal		minimal			beta	yes
 
 # Odroid C1
 
-odroidc1			current			bionic		minimal			beta	no
-odroidc1			current			buster		minimal			beta	no
+odroidc1			current			focal		minimal			stable	yes
+odroidc1			current			buster		minimal			stable	yes
+odroidc1			current			focal		minimal			beta	yes
+odroidc1			current			buster		minimal			beta	yes
 
 # Odroid C2
 

patch/kernel/meson-current/general-kernel-odroidc1-current.patch

@@ -0,0 +1,16 @@
+diff --git a/scripts/package/builddeb b/scripts/package/builddeb
+index 3b80bd3f6..79bb8de6d 100755
+--- a/scripts/package/builddeb
++++ b/scripts/package/builddeb
+@@ -285,6 +285,11 @@ if [ "$ARCH" != "um" ]; then
+ 	create_package "$dtb_packagename" "$dtb_dir"
+ fi
+ 
++sed -e "s/exit 0//g" -i $tmpdir/DEBIAN/postinst
++cat >> $tmpdir/DEBIAN/postinst <<EOT
++mkimage -A arm -O linux -T kernel -C none -a 0x2080000 -e 0x2080000 -n "Linux" -d /$installed_image_path /boot/uImage  > /dev/null 2>&1
++exit 0
++EOT
+ create_package "$packagename" "$tmpdir"
+ 
+ if [ -n "$BUILD_DEBUG" ] ; then

patch/kernel/meson-dev/general-kernel-odroidc1-dev.patch

@@ -0,0 +1,16 @@
+diff --git a/scripts/package/builddeb b/scripts/package/builddeb
+index 3b80bd3f6..79bb8de6d 100755
+--- a/scripts/package/builddeb
++++ b/scripts/package/builddeb
+@@ -285,6 +285,11 @@ if [ "$ARCH" != "um" ]; then
+ 	create_package "$dtb_packagename" "$dtb_dir"
+ fi
+ 
++sed -e "s/exit 0//g" -i $tmpdir/DEBIAN/postinst
++cat >> $tmpdir/DEBIAN/postinst <<EOT
++mkimage -A arm -O linux -T kernel -C none -a 0x2080000 -e 0x2080000 -n "Linux" -d /$installed_image_path /boot/uImage  > /dev/null 2>&1
++exit 0
++EOT
+ create_package "$packagename" "$tmpdir"
+ 
+ if [ -n "$BUILD_DEBUG" ] ; then