Better group boards like rpi

Signed-off-by: Pascal Vizeli <pvizeli@syshack.ch>

buildroot-external/barebox-env/bin/init

@@ -7,9 +7,6 @@ for i in /env/init/*; do
 	. $i
 done
 
-# Overlays
-. /env/overlay/load
-
 echo "- Hit m for menu or wait for autoboot -"
 timeout -a 1 -s -v key
 

buildroot-external/barebox-env/overlay/load

@@ -1,5 +0,0 @@
-#!/bin/sh
-
-for i in /env/overlay/*.dtbo; do
-	of_overlay $i
-done

buildroot-external/barebox.config

@@ -28,7 +28,6 @@ CONFIG_CMD_READLINK=y
 CONFIG_CMD_GETOPT=y
 CONFIG_CMD_MENUTREE=y
 CONFIG_CMD_TIMEOUT=y
-CONFIG_CMD_OF_OVERLAY=y
 CONFIG_CMD_OFTREE=y
 CONFIG_CMD_STATE=y
 CONFIG_CMD_BOOTCHOOSER=y

buildroot-external/board/raspberrypi/barebox-env/init/rpi_dt

@@ -2,3 +2,4 @@
 
 memcpy -d /tmp/rpi.dtb 0x02008000 0 0x8000
 oftree -f -l /tmp/rpi.dtb
+of_overlay /data/barebox-state-rpi.dtbo

buildroot-external/board/raspberrypi/barebox.config

@@ -1,11 +1,11 @@
 CONFIG_ARCH_BCM283X=y
-CONFIG_MACH_RPI2=y
 CONFIG_AEABI=y
 CONFIG_ARM_OPTIMZED_STRING_FUNCTIONS=y
 CONFIG_ARM_UNWIND=y
 CONFIG_MMU=y
 CONFIG_MALLOC_TLSF=y
 CONFIG_KALLSYMS=y
+CONFIG_CMD_OF_OVERLAY=y
 # CONFIG_SPI is not set
 CONFIG_MCI=y
 CONFIG_MCI_BCM283X=y

buildroot-external/board/raspberrypi/rpi2/barebox.config

@@ -0,0 +1 @@
+CONFIG_MACH_RPI2=y

buildroot-external/board/raspberrypi/rpi3/barebox.config

@@ -0,0 +1 @@
+CONFIG_MACH_RPI3=y

buildroot-external/board/rpi3/barebox.config

@@ -1,54 +0,0 @@
-CONFIG_ARCH_BCM283X=y
-CONFIG_MACH_RPI3=y
-CONFIG_AEABI=y
-CONFIG_ARM_OPTIMZED_STRING_FUNCTIONS=y
-CONFIG_ARM_UNWIND=y
-# CONFIG_LOCALVERSION_AUTO is not set
-CONFIG_MMU=y
-CONFIG_MALLOC_SIZE=0x0
-CONFIG_MALLOC_TLSF=y
-CONFIG_KALLSYMS=y
-CONFIG_PROMPT="HassOS-boot:"
-CONFIG_CMDLINE_EDITING=y
-CONFIG_AUTO_COMPLETE=y
-CONFIG_MENU=y
-# CONFIG_TIMESTAMP is not set
-CONFIG_BOOTM_SHOW_TYPE=y
-CONFIG_BOOTM_OFTREE=y
-CONFIG_FLEXIBLE_BOOTARGS=y
-# CONFIG_PARTITION_DISK_DOS is not set
-CONFIG_PARTITION_DISK_EFI=y
-# CONFIG_PARTITION_DISK_EFI_GPT_NO_FORCE is not set
-# CONFIG_PARTITION_DISK_EFI_GPT_COMPARE is not set
-CONFIG_DEFAULT_ENVIRONMENT_PATH="/build/buildroot-external/barebox-env"
-CONFIG_STATE=y
-CONFIG_BOOTCHOOSER=y
-# CONFIG_CMD_VERSION is not set
-CONFIG_CMD_BOOT=y
-CONFIG_CMD_AUTOMOUNT=y
-CONFIG_CMD_NV=y
-CONFIG_CMD_EXPORT=y
-CONFIG_CMD_GLOBAL=y
-CONFIG_CMD_BASENAME=y
-CONFIG_CMD_DIRNAME=y
-CONFIG_CMD_READLINK=y
-CONFIG_CMD_GETOPT=y
-CONFIG_CMD_MENUTREE=y
-CONFIG_CMD_TIMEOUT=y
-CONFIG_CMD_DETECT=y
-CONFIG_CMD_STATE=y
-CONFIG_CMD_BOOTCHOOSER=y
-CONFIG_SERIAL_AMBA_PL011=y
-# CONFIG_SPI is not set
-CONFIG_MCI=y
-CONFIG_MCI_BCM283X=y
-CONFIG_WATCHDOG=y
-CONFIG_WATCHDOG_BCM2835=y
-CONFIG_GPIO_BCM283X=y
-# CONFIG_PINCTRL is not set
-CONFIG_REGULATOR=y
-CONFIG_FS_FAT=y
-CONFIG_FS_FAT_WRITE=y
-CONFIG_FS_FAT_LFN=y
-CONFIG_FS_SQUASHFS=y
-CONFIG_LZ4_DECOMPRESS=y

buildroot-external/board/rpi3/post-image.sh

@@ -1,50 +0,0 @@
-#!/bin/bash
-set -e
-
-SCRIPT_DIR=${BR2_EXTERNAL_HASSOS_PATH}/scripts
-BOARD_DIR=${2}
-BOOT_DATA=${BINARIES_DIR}/boot
-
-. ${SCRIPT_DIR}/hdd-image.sh
-. ${BR2_EXTERNAL_HASSOS_PATH}/info
-. ${BOARD_DIR}/info
-
-# Filename
-IMAGE_FILE=${BINARIES_DIR}/${HASSOS_ID}_${BOARD_ID}-${VERSION_MAJOR}.${VERSION_BUILD}.img
-
-# Init boot data
-rm -rf ${BOOT_DATA}
-mkdir -p ${BOOT_DATA}
-
-cp ${BINARIES_DIR}/barebox.bin ${BOOT_DATA}/
-cp -t ${BOOT_DATA} \
-    ${BINARIES_DIR}/bcm2710-rpi-3-b.dtb \
-    ${BINARIES_DIR}/bcm2710-rpi-3-b-plus.dtb \
-    ${BINARIES_DIR}/bcm2710-rpi-cm3.dtb \
-    ${BINARIES_DIR}/rpi-firmware/bootcode.bin \
-    ${BINARIES_DIR}/rpi-firmware/fixup.dat \
-    ${BINARIES_DIR}/rpi-firmware/start.elf
-cp -r ${BINARIES_DIR}/rpi-firmware/overlays ${BOOT_DATA}/
-
-# Update Boot options
-(
-    echo "kernel=barebox.bin"
-    echo "cmdline=\"\""
-    echo "gpu_mem=16"
-    echo "disable_splash=1"
-    echo "dtparam=i2c_arm=on"
-    echo "dtparam=spi=on"
-    echo "dtparam=audio=on"
-) > ${BOOT_DATA}/config.txt
-
-touch ${BOOT_DATA}/cmdline.txt
-
-# Create other layers
-create_boot_image ${BINARIES_DIR}
-create_overlay_image ${BINARIES_DIR}
-
-create_disk_image ${BINARIES_DIR} ${IMAGE_FILE} 2
-fix_disk_image_mbr ${IMAGE_FILE}
-
-rm -rf ${IMAGE_FILE}.gz
-gzip ${IMAGE_FILE}

buildroot-external/configs/rpi2_defconfig

@@ -4,7 +4,7 @@ BR2_ARM_FPU_VFPV4=y
 BR2_DL_DIR="/cache/dl"
 BR2_CCACHE=y
 BR2_CCACHE_DIR="/cache/cc"
-BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_HASSOS_PATH)/patches $(BR2_EXTERNAL_HASSOS_PATH)/board/rpi2/patches"
+BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_HASSOS_PATH)/patches $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/patches"
 BR2_TOOLCHAIN_BUILDROOT_GLIBC=y
 BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_14=y
 BR2_GCC_VERSION_7_X=y
@@ -16,8 +16,8 @@ BR2_TARGET_GENERIC_GETTY_PORT="tty1"
 # BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW is not set
 BR2_ROOTFS_OVERLAY="$(BR2_EXTERNAL_HASSOS_PATH)/rootfs-overlay"
 BR2_ROOTFS_POST_BUILD_SCRIPT="$(BR2_EXTERNAL_HASSOS_PATH)/scripts/post-build.sh"
-BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL_HASSOS_PATH)/board/rpi2/post-image.sh"
-BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_EXTERNAL_HASSOS_PATH)/board/rpi2"
+BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/post-image.sh"
+BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/rpi2"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_GIT=y
 BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/raspberrypi/linux"
@@ -69,9 +69,9 @@ BR2_TARGET_BAREBOX=y
 BR2_TARGET_BAREBOX_CUSTOM_VERSION=y
 BR2_TARGET_BAREBOX_CUSTOM_VERSION_VALUE="2018.05.0"
 BR2_TARGET_BAREBOX_USE_CUSTOM_CONFIG=y
-BR2_TARGET_BAREBOX_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_HASSOS_PATH)/board/rpi2/barebox.config"
-BR2_TARGET_BAREBOX_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/barebox.config"
-BR2_TARGET_BAREBOX_CUSTOM_EMBEDDED_ENV_PATH="$(BR2_EXTERNAL_HASSOS_PATH)/barebox-env $(BR2_EXTERNAL_HASSOS_PATH)/board/rpi2/barebox-env"
+BR2_TARGET_BAREBOX_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/barebox.config"
+BR2_TARGET_BAREBOX_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/barebox.config $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/rpi2/barebox.config"
+BR2_TARGET_BAREBOX_CUSTOM_EMBEDDED_ENV_PATH="$(BR2_EXTERNAL_HASSOS_PATH)/barebox-env $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/barebox-env"
 BR2_PACKAGE_HOST_DOSFSTOOLS=y
 BR2_PACKAGE_HOST_E2FSPROGS=y
 BR2_PACKAGE_HOST_GPTFDISK=y

scripts/update-dtb.sh

@@ -6,5 +6,5 @@ cp -f fdt/barebox-state-efi.dtb buildroot-external/board/ova/
 
 ## Raspberry
 dtc -@ -I dts -O dtb -o fdt/barebox-state-rpi.dtbo fdt/barebox-state-rpi.dtso
-cp -f fdt/barebox-state-rpi.dtbo  buildroot-external/board/rpi2/barebox-env/overlay/
+cp -f fdt/barebox-state-rpi.dtbo  buildroot-external/board/raspberrypi/barebox-env/data/