MarkusEich · Mar 17, 2015 · Mar 18, 2015 · Mar 18, 2015 · Mar 20, 2015 · Mar 20, 2015
diff --git a/README b/README
@@ -1,12 +1,28 @@
+CURRENT STATUS: This layer is not actively maintained anymore. There are other layers based on this layer. None of them is an official OE layer though (yet)...
+* https://github.com/linux-meson/meta-amlogic
+* https://github.com/akuster/meta-odroid
+
 OpenEmbedded BSP layer for hardkernel ODROID devices
+
+Status of support devices:
+ODROID-C1: SD card image works (it is tested with core-image-minimal)
+ODROID-U2: Not tested after the fork
+ODROID-XU: ditto
+
 This layer depends on:
 
-URI: git://github.com/openembedded/oe-core.git
+URI: git://git.openembedded.org/openembedded-core
 layers: meta
-branch: dylan
+branch: dizzy
 revision: HEAD
 
 If you want to contribute changes, please send me pull
 requests via github.
 
-Main layer maintainer: Reinhard Tartler <siretart@tauware.de>
+ODROID-C1 support:
+	* Christian Ege <k4230r6@gmail.com>
+	* Tomas Novotny <tomas.novotny@tbs-biometrics.com>
+
+Short history:
+Based on meta-odroid from MarkusEich <markus.eich@gmail.com>,
+which was based on meta-odroid by Reinhard Tartler <siretart@tauware.de>
diff --git a/classes/odroidc-sdimg.bbclass b/classes/odroidc-sdimg.bbclass
@@ -0,0 +1,95 @@
+inherit image_types
+
+#
+# Create an image that can by written onto a SD card using dd.
+#
+# The disk layout used is:
+#
+#    0                      -> IMAGE_ROOTFS_ALIGNMENT         - reserved for other data
+#    IMAGE_ROOTFS_ALIGNMENT -> BOOT_SPACE                     - bootloader and kernel
+#    BOOT_SPACE             -> SDIMG_SIZE                     - rootfs
+#
+
+#                                                     Default Free space = 1.3x
+#                                                     Use IMAGE_OVERHEAD_FACTOR to add more space
+#                                                     <--------->
+#            4MiB                 SDIMG_ROOTFS
+# <-----------------------> <---------------------->
+#  ------------------------ ------------------------
+# | IMAGE_ROOTFS_ALIGNMENT | ROOTFS_SIZE            |
+#  ------------------------ ------------------------
+# ^                        ^                        ^
+# |                        |                        |
+# 0                      4MiB   SDIMG_ROOTFS
+
+# This image depends on the rootfs image
+IMAGE_TYPEDEP_odroidc-sdimg = "${SDIMG_ROOTFS_TYPE}"
+
+# Set initramfs extension
+KERNEL_INITRAMFS ?= ""
+
+# Boot partition volume id
+BOOTDD_VOLUME_ID ?= "odroid"
+
+# Boot partition size [in KiB] (will be rounded up to IMAGE_ROOTFS_ALIGNMENT)
+BOOT_SPACE ?= "20480"
+
+# Set alignment to 4MB [in KiB]
+IMAGE_ROOTFS_ALIGNMENT = "4096"
+
+# Use an uncompressed ext4 by default as rootfs
+SDIMG_ROOTFS_TYPE ?= "ext4"
+SDIMG_ROOTFS = "${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.${SDIMG_ROOTFS_TYPE}"
+
+IMAGE_DEPENDS_odroidc-sdimg = " \
+			parted-native \
+			mtools-native \
+			dosfstools-native \
+			virtual/kernel \
+			${@base_contains("KERNEL_IMAGETYPE", "uImage", "u-boot", "",d)} \
+			"
+# Amlogic Boot magic
+BL1_SUFFIX ?= "bin.hardkernel"
+BL1_SYMLINK ?= "bl1-${MACHINE}.${BL1_SUFFIX}"
+
+# U-Boot
+UBOOT_SUFFIX ?= "bin"
+UBOOT_SYMLINK ?= "u-boot-${MACHINE}.${UBOOT_SUFFIX}"
+
+# SD card image name
+SDIMG = "${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.odroidc-sdimg"
+
+IMAGE_CMD_odroidc-sdimg () {
+
+	# Align partitions
+	BOOT_SPACE_ALIGNED=$(expr ${BOOT_SPACE} + ${IMAGE_ROOTFS_ALIGNMENT} - 1)
+	BOOT_SPACE_ALIGNED=$(expr ${BOOT_SPACE_ALIGNED} - ${BOOT_SPACE_ALIGNED} % ${IMAGE_ROOTFS_ALIGNMENT})
+	ROOTFS_SIZE=`du -bks ${SDIMG_ROOTFS} | awk '{print $1}'`
+        # Round up RootFS size to the alignment size as well
+	ROOTFS_SIZE_ALIGNED=$(expr ${ROOTFS_SIZE} + ${IMAGE_ROOTFS_ALIGNMENT} - 1)
+	ROOTFS_SIZE_ALIGNED=$(expr ${ROOTFS_SIZE_ALIGNED} - ${ROOTFS_SIZE_ALIGNED} % ${IMAGE_ROOTFS_ALIGNMENT})
+	SDIMG_SIZE=$(expr ${IMAGE_ROOTFS_ALIGNMENT} + ${BOOT_SPACE_ALIGNED} + ${ROOTFS_SIZE_ALIGNED})
+
+	echo "Creating RootFS ${ROOTFS_SIZE_ALIGNED} KiB"
+
+	# Initialize sdcard image file
+	dd if=/dev/zero of=${SDIMG} bs=1024 count=0 seek=${SDIMG_SIZE}
+
+	# Create partition table
+	parted -s ${SDIMG} mklabel msdos
+	# Create rootfs partition to the end of disk
+	parted -s ${SDIMG} -- unit KiB mkpart primary ext2 ${IMAGE_ROOTFS_ALIGNMENT} -1s
+	# Set boot flag
+	parted -s ${SDIMG} set 1 boot on
+	parted ${SDIMG} print
+
+	# Burn amlogic's intial bootloader BL1
+	dd if=${DEPLOY_DIR_IMAGE}/${BL1_SYMLINK} of=${SDIMG} bs=1 count=442 conv=notrunc
+	dd if=${DEPLOY_DIR_IMAGE}/${BL1_SYMLINK} of=${SDIMG} bs=512 skip=1 seek=1 conv=notrunc
+
+	# Burn u-boot
+	dd if=${DEPLOY_DIR_IMAGE}/${UBOOT_SYMLINK} of=${SDIMG} bs=512 seek=64 conv=notrunc
+
+	# Burn Partition
+	dd if=${SDIMG_ROOTFS} of=${SDIMG} conv=notrunc seek=1 bs=$(expr ${IMAGE_ROOTFS_ALIGNMENT} \* 1024) && sync && sync
+}
diff --git a/conf/machine/odroid-c1.conf b/conf/machine/odroid-c1.conf
@@ -0,0 +1,37 @@
+#@TYPE: Machine
+#@NAME: ODROID-C1
+#@DESCRIPTION: Machine configuration for the ODROID-C1 by Hardkernel
+
+TARGET_ARCH = "arm"
+
+MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += " \
+        u-boot-ini \
+        kernel-image \
+        kernel-devicetree \
+        "
+
+MACHINE_EXTRA_RRECOMMENDS += " \
+        kernel-modules \
+        "
+
+PREFERRED_PROVIDER_virtual/kernel = "linux-hardkernel"
+
+PREFERRED_PROVIDER_virtual/bootloader = "u-boot-hardkernel"
+PREFERRED_PROVIDER_u-boot = "u-boot-hardkernel"
+PREFERRED_VERSION_u-boot-hardkernel = "v2011.03%"
+
+UBOOT_MACHINE = "odroidc_config"
+
+KERNEL_DEVICETREE = "meson8b_odroidc.dtb"
+
+KERNEL_IMAGETYPE = "uImage"
+IMAGE_CLASSES += "odroidc-sdimg"
+# ${SDIMG_ROOTFS_TYPE} is workaround, otherwise system mkfs.extX is used
+# (e2fsprogs-native aren't built automatically). Native e2fsprogs should be
+# built automatically because of IMAGE_TYPEDEP specified in odroidc-sdimg class.
+IMAGE_FSTYPES += "tar.gz odroidc-sdimg ${SDIMG_ROOTFS_TYPE}"
+
+SERIAL_CONSOLE = "115200 ttyS0"
+
+DEFAULTTUNE ?= "cortexa5hf-neon"
+require conf/machine/include/tune-cortexa5.inc
diff --git a/recipes-bsp/u-boot-hardkernel/files/0001-ucl-use-host-compiler-supplied-by-OE.patch b/recipes-bsp/u-boot-hardkernel/files/0001-ucl-use-host-compiler-supplied-by-OE.patch
@@ -0,0 +1,43 @@
+From cd3170fe15a9b7effe81841ab7ba58d3b525a588 Mon Sep 17 00:00:00 2001
+From: Tomas Novotny <tomas.novotny@tbs-biometrics.com>
+Date: Tue, 17 Mar 2015 13:45:29 +0100
+Subject: [PATCH] ucl: use host compiler supplied by OE
+
+UCL build failed because CC was redefined by OE to the target's compiler.
+
+Upstream-Status: Pending
+
+Signed-off-by: Tomas Novotny <tomas.novotny@tbs-biometrics.com>
+---
+ tools/ucl/makefile | 5 ++---
+ 1 file changed, 2 insertions(+), 3 deletions(-)
+
+diff --git a/tools/ucl/makefile b/tools/ucl/makefile
+index 38d4472..b8ade98 100755
+--- a/tools/ucl/makefile
++++ b/tools/ucl/makefile
+@@ -1,7 +1,6 @@
+ uclobjs = $(obj)ucl_linux
+ UTILOBJS = $(patsubst %.c,$(uclobjs)/%.o,$(wildcard src/*.c))
+
+-CC=gcc
+ AR=ar
+ LD=gcc
+ RM=rm -rf 
+@@ -17,11 +16,11 @@ all: $(UTILOBJS)
+
+ $(uclobjs)/%.o : %.cpp
+ 	$(MKDIR) -p $(@D)
+-	$(CC) -c $(CFLAGS) $< -o $@
++	$(HOSTCC) -c $(CFLAGS) $< -o $@
+
+ $(uclobjs)/%.o : %.c
+ 	$(MKDIR) -p $(@D)
+-	$(CC) -c $(CFLAGS) $< -o $@
++	$(HOSTCC) -c $(CFLAGS) $< -o $@
+
+ clean:
+ 	$(RM) $(uclobjs)
+-- 
+1.8.3.1
+
diff --git a/recipes-bsp/u-boot-hardkernel/files/0002-added-hardfp-support.patch b/recipes-bsp/u-boot-hardkernel/files/0002-added-hardfp-support.patch
@@ -0,0 +1,12 @@
+diff --git a/arch/arm/cpu/aml_meson/config.mk b/arch/arm/cpu/aml_meson/config.mk
+index 151ef9a..5a0071d 100755
+--- a/arch/arm/cpu/aml_meson/config.mk
++++ b/arch/arm/cpu/aml_meson/config.mk
+@@ -1,6 +1,6 @@
+ CROSS_COMPILE=arm-none-eabi-
+ ARM_CPU=cortex-a9
+-PLATFORM_CPPFLAGS += $(call cc-option,-mcpu=cortex-a9 -ffixed-r8 -mno-long-calls  -Wall -fPIC )
++PLATFORM_CPPFLAGS += $(call cc-option,-mcpu=cortex-a9 -ffixed-r8 -mno-long-calls  -Wall -fPIC -mfloat-abi=hard -mfpu=vfpv3 )
+ PF_CPPFLAGS_NO_UNALIGNED := $(call cc-option, -mno-unaligned-access,)
+ PLATFORM_CPPFLAGS += $(PF_CPPFLAGS_NO_UNALIGNED)
+ #USE_PRIVATE_LIBGCC=yes
diff --git a/recipes-bsp/u-boot-hardkernel/files/0003-use-lldiv-for-64-bit-division.patch b/recipes-bsp/u-boot-hardkernel/files/0003-use-lldiv-for-64-bit-division.patch
@@ -0,0 +1,53 @@
+From e1789eb5319248fd6861d927b1f0f9232b1c4b5f Mon Sep 17 00:00:00 2001
+From: Christian Ege <k4230r6@gmail.com>
+Date: Sat, 28 Mar 2015 21:27:26 +0100
+Subject: [PATCH] use lldiv() for 64-bit division
+
+Otherwise u-boot will crash with
+    Enter Exception:0x00000001
+
+The original Patch was from Ilya Yanok yanok@emcraft.com
+
+Signed-off-by: Christian Ege <k4230r6@gmail.com>
+---
+ drivers/mmc/aml_sd_mmc.c |    3 ++-
+ drivers/mmc/mmc.c        |    2 +-
+ 2 files changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/drivers/mmc/aml_sd_mmc.c b/drivers/mmc/aml_sd_mmc.c
+index 8cadd01..3db9eee 100644
+--- a/drivers/mmc/aml_sd_mmc.c
++++ b/drivers/mmc/aml_sd_mmc.c
+@@ -15,6 +15,7 @@
+ #include <asm/arch/io.h>
+ #include <asm/arch/sdio.h>
+ #include <mmc.h>
++#include <div64.h>
+
+ #ifdef CONFIG_STORE_COMPATIBLE
+ #include <asm/arch/storage.h>
+@@ -449,7 +450,7 @@ int aml_sd_send_cmd(struct mmc *mmc, struct mmc_cmd *cmd, struct	mmc_data *data)
+ 	case MMC_CMD_WRITE_SINGLE_BLOCK:
+ 	case MMC_CMD_WRITE_MULTIPLE_BLOCK:
+ 		if(mmc->high_capacity)
+-			ret = mmc->capacity/mmc->read_bl_len <= cmd->cmdarg;
++			ret = lldiv(mmc->capacity,mmc->read_bl_len) <= cmd->cmdarg;
+ 		else
+ 			ret = mmc->capacity <= cmd->cmdarg;
+ 		if(ret)
+diff --git a/drivers/mmc/mmc.c b/drivers/mmc/mmc.c
+index 5b3cfe0..07d66d2 100644
+--- a/drivers/mmc/mmc.c
++++ b/drivers/mmc/mmc.c
+@@ -1144,7 +1144,7 @@ int mmc_startup(struct mmc *mmc)
+ 	mmc->block_dev.lun = 0;
+ 	mmc->block_dev.type = 0;
+ 	mmc->block_dev.blksz = mmc->read_bl_len;
+-	mmc->block_dev.lba = mmc->capacity/mmc->read_bl_len;
++	mmc->block_dev.lba = lldiv(mmc->capacity,mmc->read_bl_len);
+ 	sprintf(mmc->block_dev.vendor,"Man %02x%02x%02x Snr %02x%02x%02x%02x",
+ 			mmc->cid[0], mmc->cid[1], mmc->cid[2],
+ 			mmc->cid[9], mmc->cid[10], mmc->cid[11], mmc->cid[12]);
+-- 
+1.7.9.5
+
diff --git a/recipes-bsp/u-boot-hardkernel/files/odroid-c1/boot.ini b/recipes-bsp/u-boot-hardkernel/files/odroid-c1/boot.ini
@@ -0,0 +1,74 @@
+ODROIDC-UBOOT-CONFIG
+
+# Possible screen resolutions
+# Uncomment only a single Line! The line with setenv written.
+# At least one mode must be selected.
+
+# setenv m "vga"            # 640x480
+# setenv m "480p"           # 720x480
+# setenv m "576p"           # 720x576
+# setenv m "800x480p60hz"   # 800x480
+# setenv m "800x600p60hz"   # 800x600
+# setenv m "1024x600p60hz"  # 1024x600
+# setenv m "1024x768p60hz"  # 1024x768
+# setenv m "1360x768p60hz"  # 1360x768
+# setenv m "1366x768p60hz"  # 1366x768
+# setenv m "1440x900p60hz"  # 1440x900
+# setenv m "1600x900p60hz"  # 1600x900
+# setenv m "1680x1050p60hz" # 1680x1050
+# setenv m "720p"           # 720p 1280x720
+# setenv m "800p"           # 1280x800
+# setenv m "sxga"           # 1280x1024
+# setenv m "1080i50hz"      # 1080I@50Hz
+# setenv m "1080p24hz"      # 1080P@24Hz
+# setenv m "1080p50hz"      # 1080P@50Hz
+setenv m "1080p"            # 1080P@60Hz
+# setenv m "1920x1200"      # 1920x1200
+
+# HDMI DVI Mode Configuration
+setenv vout_mode "hdmi"
+# setenv vout_mode "dvi"
+
+# HDMI BPP Mode
+setenv m_bpp "32"
+# setenv m_bpp "24"
+# setenv m_bpp "16"
+
+# HDMI Hotplug Force (HPD)
+# 1 = Enables HOTPlug Detection
+# 0 = Disables HOTPlug Detection and force the connected status
+setenv hpd "0"
+
+# CEC Enable/Disable (Requires Hardware Modification)
+# 1 = Enables HDMI CEC
+# 0 = Disables HDMI CEC
+setenv cec "0"
+
+# UHS Card Configuration
+# Uncomment the line below to __DISABLE__ UHS-1 MicroSD support
+# This might break boot for some brand models of cards.
+setenv disableuhs "disableuhs"
+
+# Disable VPU (Video decoding engine, Saves RAM!!!)
+# 0 = disabled
+# 1 = enabled
+setenv vpu "1"
+
+# Disable HDMI Output (Again, saves ram!)
+# 0 = disabled
+# 1 = enabled
+setenv hdmioutput "1"
+
+if test "${hpd}" = "0"; then setenv hdmi_hpd "disablehpd=true"; fi
+if test "${cec}" = "1"; then setenv hdmi_cec "hdmitx=cecf"; fi
+
+setenv bootargs "console=ttyS0,115200n8 console=tty0 root=/dev/mmcblk0p1 rootwait rw 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}"
+ext4load mmc 0:1 0x21000000 /boot/uImage
+ext4load mmc 0:1 0x21800000 /boot/meson8b_odroidc.dtb
+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 - 0x21800000