diff --git a/Documentation/kernel.md b/Documentation/kernel.md index 46bd56e38..6ea7e7830 100644 --- a/Documentation/kernel.md +++ b/Documentation/kernel.md @@ -8,7 +8,7 @@ Default Kernel tree: 5.4 | Open Virtual Applicance | 5.4.11 | | Raspberry Pi | 4.19.93 | | Tinker Board | 4.19.88 | -| Odroid-C2 | 5.4.11 | -| Odroid-N2 | 5.4.11 | -| Odroid-XU4 | 5.4.11 | +| Odroid-C2 | 5.4.16 | +| Odroid-N2 | 5.4.16 | +| Odroid-XU4 | 5.4.16 | | Intel NUC | 5.4.11 | diff --git a/README.md b/README.md index 6f593233b..8bcfecaa6 100644 --- a/README.md +++ b/README.md @@ -7,9 +7,9 @@ Hass.io OS based on [buildroot](https://buildroot.org/). It's a hypervisor for D - Barebox as bootloader on EFI - U-Boot as bootloader on IoT +- Linux/Buildroot LTS - RAUC for OTA updates - SquashFS LZ4 as filesystem -- Docker 18.09.0 +- Docker-CE - AppArmor protected - ZRAM LZ4 for /tmp, /var, swap -- Run every supervisor diff --git a/azure-pipelines-release.yml b/azure-pipelines-release.yml index 51da2e00c..ce6949a1d 100644 --- a/azure-pipelines-release.yml +++ b/azure-pipelines-release.yml @@ -13,7 +13,7 @@ variables: - name: versionGHR value: 'v0.13.0' - group: github - - group: hassos + - group: rauc jobs: diff --git a/buildroot-external/board/asus/tinker/uboot.config b/buildroot-external/board/asus/tinker/uboot.config index 97cc22fbf..d72a331d4 100644 --- a/buildroot-external/board/asus/tinker/uboot.config +++ b/buildroot-external/board/asus/tinker/uboot.config @@ -1,5 +1,3 @@ # CONFIG_USB_STORAGE is not set # CONFIG_DOS_PARTITION is not set CONFIG_DM_VIDEO=y -CONFIG_CMD_FILEENV=y -CONFIG_ENV_IS_NOWHERE=Y diff --git a/buildroot-external/board/hardkernel/odroid-c2/kernel.config b/buildroot-external/board/hardkernel/odroid-c2/kernel.config index 17263e568..25a143315 100644 --- a/buildroot-external/board/hardkernel/odroid-c2/kernel.config +++ b/buildroot-external/board/hardkernel/odroid-c2/kernel.config @@ -2194,7 +2194,7 @@ CONFIG_FIXED_PHY=y # CONFIG_LXT_PHY is not set CONFIG_MARVELL_PHY=m CONFIG_MARVELL_10G_PHY=m -# CONFIG_MESON_GXL_PHY is not set +CONFIG_MESON_GXL_PHY=y CONFIG_MICREL_PHY=y CONFIG_MICROCHIP_PHY=m # CONFIG_MICROCHIP_T1_PHY is not set @@ -2768,7 +2768,7 @@ CONFIG_I2C_DESIGNWARE_PLATFORM=y # CONFIG_I2C_EMEV2 is not set CONFIG_I2C_GPIO=m # CONFIG_I2C_GPIO_FAULT_INJECTOR is not set -# CONFIG_I2C_MESON is not set +CONFIG_I2C_MESON=y # CONFIG_I2C_NOMADIK is not set # CONFIG_I2C_OCORES is not set # CONFIG_I2C_PCA_PLATFORM is not set @@ -3412,6 +3412,7 @@ CONFIG_REGULATOR_S2MPS11=y CONFIG_REGULATOR_VCTRL=m # CONFIG_REGULATOR_VEXPRESS is not set CONFIG_CEC_CORE=m +CONFIG_CEC_NOTIFIER=y CONFIG_RC_CORE=m CONFIG_RC_MAP=m # CONFIG_LIRC is not set @@ -3436,7 +3437,7 @@ CONFIG_RC_DEVICES=y # CONFIG_IR_MCEUSB is not set # CONFIG_IR_ITE_CIR is not set # CONFIG_IR_FINTEK is not set -# CONFIG_IR_MESON is not set +CONFIG_IR_MESON=m # CONFIG_IR_NUVOTON is not set # CONFIG_IR_REDRAT3 is not set # CONFIG_IR_STREAMZAP is not set @@ -3458,7 +3459,7 @@ CONFIG_MEDIA_ANALOG_TV_SUPPORT=y CONFIG_MEDIA_DIGITAL_TV_SUPPORT=y # CONFIG_MEDIA_RADIO_SUPPORT is not set # CONFIG_MEDIA_SDR_SUPPORT is not set -# CONFIG_MEDIA_CEC_SUPPORT is not set +CONFIG_MEDIA_CEC_SUPPORT=y # CONFIG_MEDIA_CEC_RC is not set CONFIG_MEDIA_CONTROLLER=y # CONFIG_MEDIA_CONTROLLER_DVB is not set @@ -3574,6 +3575,10 @@ CONFIG_USB_GSPCA=m # Webcam, TV (analog/digital) USB devices # # CONFIG_VIDEO_EM28XX is not set + +# +# USB HDMI CEC adapters +# # CONFIG_MEDIA_PCI_SUPPORT is not set CONFIG_V4L_PLATFORM_DRIVERS=y # CONFIG_VIDEO_CAFE_CCIC is not set @@ -3586,6 +3591,11 @@ CONFIG_V4L_MEM2MEM_DRIVERS=y # CONFIG_VIDEO_SH_VEU is not set # CONFIG_V4L_TEST_DRIVERS is not set # CONFIG_DVB_PLATFORM_DRIVERS is not set +CONFIG_CEC_PLATFORM_DRIVERS=y +# CONFIG_VIDEO_CROS_EC_CEC is not set +CONFIG_VIDEO_MESON_AO_CEC=m +# CONFIG_VIDEO_MESON_G12A_AO_CEC is not set +# CONFIG_CEC_GPIO is not set # # Supported MMC/SDIO adapters @@ -5719,8 +5729,8 @@ CONFIG_RAS=y # CONFIG_DAX is not set CONFIG_NVMEM=y CONFIG_NVMEM_SYSFS=y -CONFIG_NVMEM_BCM_OCOTP=y -# CONFIG_MESON_EFUSE is not set +# CONFIG_NVMEM_BCM_OCOTP is not set +CONFIG_MESON_EFUSE=y # CONFIG_MESON_MX_EFUSE is not set # diff --git a/buildroot-external/board/hardkernel/odroid-c2/uboot-boot.ush b/buildroot-external/board/hardkernel/odroid-c2/uboot-boot.ush index 0135a0744..2a71bc289 100644 --- a/buildroot-external/board/hardkernel/odroid-c2/uboot-boot.ush +++ b/buildroot-external/board/hardkernel/odroid-c2/uboot-boot.ush @@ -38,7 +38,6 @@ usb start # Load extraargs fileenv mmc ${devnum}:1 ${ramdisk_addr_r} cmdline.txt cmdline fatload mmc ${devnum}:1 ${fdt_addr_r} meson-gxbb-odroidc2.dtb -#fdt addr ${fdt_addr_r} # logical volumes get numbered after physical ones. # 1. boot diff --git a/buildroot-external/board/hardkernel/odroid-c2/uboot.config b/buildroot-external/board/hardkernel/odroid-c2/uboot.config index f276dedff..3d870b43c 100644 --- a/buildroot-external/board/hardkernel/odroid-c2/uboot.config +++ b/buildroot-external/board/hardkernel/odroid-c2/uboot.config @@ -1,8 +1,6 @@ -# CONFIG_USB_STORAGE is not set CONFIG_DOS_PARTITION=y # CONFIG_EFI_PARTITION is not set +# CONFIG_USB_STORAGE is not set CONFIG_USB=y CONFIG_CMD_USB=y CONFIG_DM_USB=y -CONFIG_CMD_FILEENV=y -CONFIG_ENV_IS_NOWHERE=Y diff --git a/buildroot-external/board/hardkernel/odroid-n2/kernel.config b/buildroot-external/board/hardkernel/odroid-n2/kernel.config index 48787dff0..8a17810ea 100644 --- a/buildroot-external/board/hardkernel/odroid-n2/kernel.config +++ b/buildroot-external/board/hardkernel/odroid-n2/kernel.config @@ -2768,7 +2768,7 @@ CONFIG_I2C_DESIGNWARE_PLATFORM=y # CONFIG_I2C_EMEV2 is not set CONFIG_I2C_GPIO=m # CONFIG_I2C_GPIO_FAULT_INJECTOR is not set -# CONFIG_I2C_MESON is not set +CONFIG_I2C_MESON=y # CONFIG_I2C_NOMADIK is not set # CONFIG_I2C_OCORES is not set # CONFIG_I2C_PCA_PLATFORM is not set @@ -3412,6 +3412,7 @@ CONFIG_REGULATOR_S2MPS11=y CONFIG_REGULATOR_VCTRL=m # CONFIG_REGULATOR_VEXPRESS is not set CONFIG_CEC_CORE=m +CONFIG_CEC_NOTIFIER=y CONFIG_RC_CORE=m CONFIG_RC_MAP=m # CONFIG_LIRC is not set @@ -3436,7 +3437,7 @@ CONFIG_RC_DEVICES=y # CONFIG_IR_MCEUSB is not set # CONFIG_IR_ITE_CIR is not set # CONFIG_IR_FINTEK is not set -# CONFIG_IR_MESON is not set +CONFIG_IR_MESON=m # CONFIG_IR_NUVOTON is not set # CONFIG_IR_REDRAT3 is not set # CONFIG_IR_STREAMZAP is not set @@ -3458,7 +3459,7 @@ CONFIG_MEDIA_ANALOG_TV_SUPPORT=y CONFIG_MEDIA_DIGITAL_TV_SUPPORT=y # CONFIG_MEDIA_RADIO_SUPPORT is not set # CONFIG_MEDIA_SDR_SUPPORT is not set -# CONFIG_MEDIA_CEC_SUPPORT is not set +CONFIG_MEDIA_CEC_SUPPORT=y # CONFIG_MEDIA_CEC_RC is not set CONFIG_MEDIA_CONTROLLER=y # CONFIG_MEDIA_CONTROLLER_DVB is not set @@ -3574,6 +3575,10 @@ CONFIG_USB_GSPCA=m # Webcam, TV (analog/digital) USB devices # # CONFIG_VIDEO_EM28XX is not set + +# +# USB HDMI CEC adapters +# # CONFIG_MEDIA_PCI_SUPPORT is not set CONFIG_V4L_PLATFORM_DRIVERS=y # CONFIG_VIDEO_CAFE_CCIC is not set @@ -3586,6 +3591,11 @@ CONFIG_V4L_MEM2MEM_DRIVERS=y # CONFIG_VIDEO_SH_VEU is not set # CONFIG_V4L_TEST_DRIVERS is not set # CONFIG_DVB_PLATFORM_DRIVERS is not set +CONFIG_CEC_PLATFORM_DRIVERS=y +# CONFIG_VIDEO_CROS_EC_CEC is not set +CONFIG_VIDEO_MESON_AO_CEC=m +CONFIG_VIDEO_MESON_G12A_AO_CEC=m +# CONFIG_CEC_GPIO is not set # # Supported MMC/SDIO adapters @@ -3870,7 +3880,7 @@ CONFIG_DRM_I2C_ADV7511_CEC=y CONFIG_DRM_DW_HDMI=m # CONFIG_DRM_DW_HDMI_AHB_AUDIO is not set CONFIG_DRM_DW_HDMI_I2S_AUDIO=m -# CONFIG_DRM_DW_HDMI_CEC is not set +CONFIG_DRM_DW_HDMI_CEC=m # end of Display Interface Bridges CONFIG_DRM_ETNAVIV=m @@ -4130,15 +4140,18 @@ CONFIG_SND_SOC=y # # ASoC support for Amlogic platforms # -# CONFIG_SND_MESON_AXG_FRDDR is not set -# CONFIG_SND_MESON_AXG_TODDR is not set -# CONFIG_SND_MESON_AXG_TDMIN is not set -# CONFIG_SND_MESON_AXG_TDMOUT is not set -# CONFIG_SND_MESON_AXG_SOUND_CARD is not set -# CONFIG_SND_MESON_AXG_SPDIFOUT is not set -# CONFIG_SND_MESON_AXG_SPDIFIN is not set -# CONFIG_SND_MESON_AXG_PDM is not set -# CONFIG_SND_MESON_G12A_TOHDMITX is not set +CONFIG_SND_MESON_AXG_FIFO=m +CONFIG_SND_MESON_AXG_FRDDR=m +CONFIG_SND_MESON_AXG_TODDR=m +CONFIG_SND_MESON_AXG_TDM_FORMATTER=m +CONFIG_SND_MESON_AXG_TDM_INTERFACE=m +CONFIG_SND_MESON_AXG_TDMIN=m +CONFIG_SND_MESON_AXG_TDMOUT=m +CONFIG_SND_MESON_AXG_SOUND_CARD=m +CONFIG_SND_MESON_AXG_SPDIFOUT=m +CONFIG_SND_MESON_AXG_SPDIFIN=m +CONFIG_SND_MESON_AXG_PDM=m +CONFIG_SND_MESON_G12A_TOHDMITX=y # end of ASoC support for Amlogic platforms # CONFIG_SND_SOC_SOF_TOPLEVEL is not set @@ -4196,7 +4209,7 @@ CONFIG_SND_SOC_AK4613=m # CONFIG_SND_SOC_CS53L30 is not set # CONFIG_SND_SOC_CX2072X is not set CONFIG_SND_SOC_DMIC=m -CONFIG_SND_SOC_HDMI_CODEC=m +CONFIG_SND_SOC_HDMI_CODEC=y CONFIG_SND_SOC_ES7134=m CONFIG_SND_SOC_ES7241=m # CONFIG_SND_SOC_ES8316 is not set @@ -5654,7 +5667,7 @@ CONFIG_MESON_IRQ_GPIO=y # CONFIG_IPACK_BUS is not set CONFIG_RESET_CONTROLLER=y CONFIG_RESET_MESON=y -# CONFIG_RESET_MESON_AUDIO_ARB is not set +CONFIG_RESET_MESON_AUDIO_ARB=y # CONFIG_RESET_TI_SYSCON is not set # @@ -5719,8 +5732,8 @@ CONFIG_RAS=y # CONFIG_DAX is not set CONFIG_NVMEM=y CONFIG_NVMEM_SYSFS=y -CONFIG_NVMEM_BCM_OCOTP=y -# CONFIG_MESON_EFUSE is not set +# CONFIG_NVMEM_BCM_OCOTP is not set +CONFIG_MESON_EFUSE=y # CONFIG_MESON_MX_EFUSE is not set # diff --git a/buildroot-external/board/hardkernel/odroid-n2/uboot-boot.ush b/buildroot-external/board/hardkernel/odroid-n2/uboot-boot.ush index 230a2252a..e5ddb09b5 100644 --- a/buildroot-external/board/hardkernel/odroid-n2/uboot-boot.ush +++ b/buildroot-external/board/hardkernel/odroid-n2/uboot-boot.ush @@ -40,7 +40,6 @@ usb start # Load extraargs fileenv mmc ${devnum}:1 ${ramdisk_addr_r} cmdline.txt cmdline fatload mmc ${devnum}:1 ${fdt_addr_r} meson-g12b-odroid-n2.dtb -#fdt addr ${fdt_addr_r} # logical volumes get numbered after physical ones. # 1. boot diff --git a/buildroot-external/board/hardkernel/odroid-n2/uboot.config b/buildroot-external/board/hardkernel/odroid-n2/uboot.config index f276dedff..335a6ab2f 100644 --- a/buildroot-external/board/hardkernel/odroid-n2/uboot.config +++ b/buildroot-external/board/hardkernel/odroid-n2/uboot.config @@ -1,8 +1,3 @@ -# CONFIG_USB_STORAGE is not set CONFIG_DOS_PARTITION=y # CONFIG_EFI_PARTITION is not set -CONFIG_USB=y -CONFIG_CMD_USB=y -CONFIG_DM_USB=y -CONFIG_CMD_FILEENV=y -CONFIG_ENV_IS_NOWHERE=Y +# CONFIG_USB_STORAGE is not set diff --git a/buildroot-external/board/hardkernel/odroid-xu4/uboot-boot.ush b/buildroot-external/board/hardkernel/odroid-xu4/uboot-boot.ush index b5bcc1d29..03459ece1 100644 --- a/buildroot-external/board/hardkernel/odroid-xu4/uboot-boot.ush +++ b/buildroot-external/board/hardkernel/odroid-xu4/uboot-boot.ush @@ -7,14 +7,11 @@ mmc dev ${devnum} # Note that import is performed twice for backwards compatability. setenv loadbootstate " \ echo 'loading env...'; \ - mw.b ${ramdisk_addr_r} 0 0x4000; \ mmc read ${ramdisk_addr_r} ${mmc_env} 0x20; \ - env import -c ${ramdisk_addr_r} 0x2000 || \ env import -c ${ramdisk_addr_r} 0x4000;" setenv storebootstate " \ echo 'storing env...'; \ - mw.b ${ramdisk_addr_r} 0 0x4000; \ env export -c -s 0x4000 ${ramdisk_addr_r} BOOT_ORDER BOOT_A_LEFT BOOT_B_LEFT; \ mmc write ${ramdisk_addr_r} ${mmc_env} 0x20;" diff --git a/buildroot-external/board/hardkernel/odroid-xu4/uboot.config b/buildroot-external/board/hardkernel/odroid-xu4/uboot.config index fa8e515a6..4ab6d289f 100644 --- a/buildroot-external/board/hardkernel/odroid-xu4/uboot.config +++ b/buildroot-external/board/hardkernel/odroid-xu4/uboot.config @@ -1,6 +1,4 @@ -# CONFIG_USB_STORAGE is not set CONFIG_DOS_PARTITION=y # CONFIG_EFI_PARTITION is not set -CONFIG_CMD_FILEENV=y -CONFIG_ENV_IS_NOWHERE=Y +# CONFIG_USB_STORAGE is not set CONFIG_DISPLAY_BOARDINFO=y diff --git a/buildroot-external/board/hardkernel/patches/linux/0004-meson-g12-odroid-n2_s922x-compatible.patch b/buildroot-external/board/hardkernel/patches/linux/0004-meson-g12-odroid-n2_s922x-compatible.patch new file mode 100644 index 000000000..6b13d9aea --- /dev/null +++ b/buildroot-external/board/hardkernel/patches/linux/0004-meson-g12-odroid-n2_s922x-compatible.patch @@ -0,0 +1,29 @@ +From 409a0daa72f6fc1652e17cfea7ea1055e9c483c9 Mon Sep 17 00:00:00 2001 +From: Neil Armstrong +Date: Mon, 21 Oct 2019 16:29:02 +0200 +Subject: [PATCH] arm64: dts: meson-g12b-odroid-n2: add missing amlogic, s922x + compatible + +This fixes the following DT schemas check errors: +meson-g12b-odroid-n2.dt.yaml: /: compatible: ['hardkernel,odroid-n2', 'amlogic,g12b'] is not valid under any of the given schemas + +Signed-off-by: Neil Armstrong +Reviewed-by: Martin Blumenstingl +Signed-off-by: Kevin Hilman +--- + arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dts | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dts b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dts +index 42f15405750cd..0e54c1dc2842b 100644 +--- a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dts ++++ b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dts +@@ -12,7 +12,7 @@ + #include + + / { +- compatible = "hardkernel,odroid-n2", "amlogic,g12b"; ++ compatible = "hardkernel,odroid-n2", "amlogic,s922x", "amlogic,g12b"; + model = "Hardkernel ODROID-N2"; + + aliases { diff --git a/buildroot-external/board/hardkernel/patches/uboot/0001-Amlogic-w400-read-ethaddr-from-efuse.patch b/buildroot-external/board/hardkernel/patches/uboot/0001-Amlogic-w400-read-ethaddr-from-efuse.patch new file mode 100644 index 000000000..3851f338e --- /dev/null +++ b/buildroot-external/board/hardkernel/patches/uboot/0001-Amlogic-w400-read-ethaddr-from-efuse.patch @@ -0,0 +1,55 @@ +From b93c598b1acfe59ffac342d114483af8a45a78ac Mon Sep 17 00:00:00 2001 +From: Pascal Vizeli +Date: Sat, 1 Feb 2020 20:55:39 +0000 +Subject: [PATCH 1/1] Amlogic w400: read ethaddr from efuse + +Signed-off-by: Pascal Vizeli +--- + board/amlogic/w400/w400.c | 25 ++++++++++++++++++++++++- + 1 file changed, 24 insertions(+), 1 deletion(-) + +diff --git a/board/amlogic/w400/w400.c b/board/amlogic/w400/w400.c +index e60dc3a622..d4028c6a39 100644 +--- a/board/amlogic/w400/w400.c ++++ b/board/amlogic/w400/w400.c +@@ -6,13 +6,36 @@ + + #include + #include +-#include ++#include + #include ++#include + #include + ++#define EFUSE_MAC_OFFSET 20 ++#define EFUSE_MAC_SIZE 12 ++ + int misc_init_r(void) + { ++ u8 mac_addr[6]; ++ char efuse_mac_addr[EFUSE_MAC_SIZE], buff[3]; ++ ssize_t len; ++ + meson_eth_init(PHY_INTERFACE_MODE_RGMII, 0); + ++ if (!eth_env_get_enetaddr("ethaddr", mac_addr)) { ++ len = meson_sm_read_efuse(EFUSE_MAC_OFFSET, ++ efuse_mac_addr, EFUSE_MAC_SIZE); ++ if (len != EFUSE_MAC_SIZE) ++ return 0; ++ ++ for (int i = 0; i < 6; i++){ ++ buff[0] = efuse_mac_addr[i * 2]; ++ buff[1] = efuse_mac_addr[i * 2 + 1]; ++ mac_addr[i] = simple_strtoul(buff, NULL, 16); ++ } ++ if(is_valid_ethaddr(mac_addr)) ++ eth_env_set_enetaddr("ethaddr", mac_addr); ++ } ++ + return 0; + } +-- +2.17.1 + diff --git a/buildroot-external/board/intel/nuc/kernel.config b/buildroot-external/board/intel/nuc/kernel.config index 43e1899d7..6180ff09e 100644 --- a/buildroot-external/board/intel/nuc/kernel.config +++ b/buildroot-external/board/intel/nuc/kernel.config @@ -13,17 +13,12 @@ CONFIG_DRM_I915_CAPTURE_ERROR=y CONFIG_DRM_I915_COMPRESS_ERROR=y CONFIG_DRM_I915_USERPTR=y -CONFIG_SND_HDA=m +CONFIG_SND_HDA=y +CONFIG_SND_HDA_CORE=y +CONFIG_SND_HDA_GENERIC=y CONFIG_SND_HDA_INTEL=m -CONFIG_SND_HDA_I915=y -CONFIG_SND_HDA_POWER_SAVE_DEFAULT=1 - -CONFIG_BT=y -CONFIG_BT_BREDR=y -CONFIG_BT_LE=y -CONFIG_BT_INTEL=m -CONFIG_BT_BCM=m -CONFIG_BT_RTL=m -CONFIG_BT_HCIBTUSB=m -CONFIG_BT_HCIBTUSB_BCM=y -CONFIG_BT_HCIBTUSB_RTL=y +CONFIG_SND_HDA_I915=m +CONFIG_SND_HDA_CODEC_REALTEK=m +CONFIG_SND_HDA_CODEC_ANALOG=m +CONFIG_SND_HDA_CODEC_VIA=m +CONFIG_SND_HDA_CODEC_HDMI=m diff --git a/buildroot-external/board/raspberrypi/uboot.config b/buildroot-external/board/raspberrypi/uboot.config index 622f91b73..d003a8df7 100644 --- a/buildroot-external/board/raspberrypi/uboot.config +++ b/buildroot-external/board/raspberrypi/uboot.config @@ -1,6 +1,4 @@ # CONFIG_DOS_PARTITION is not set -CONFIG_CMD_FILEENV=y -CONFIG_ENV_IS_NOWHERE=Y CONFIG_USB_STORAGE=y CONFIG_USB_FUNCTION_MASS_STORAGE=y CONFIG_USB_EHCI_HCD=y diff --git a/buildroot-external/bootloader/uboot.config b/buildroot-external/bootloader/uboot.config index c7ea69e70..014927f68 100644 --- a/buildroot-external/bootloader/uboot.config +++ b/buildroot-external/bootloader/uboot.config @@ -11,5 +11,7 @@ CONFIG_FS_EXT4=y CONFIG_FS_FAT=y # CONFIG_ENV_IS_IN_FAT is not set # CONFIG_ENV_IS_IN_EXT4 is not set +CONFIG_ENV_IS_NOWHERE=Y # CONFIG_EFI_LOADER is not set CONFIG_CMD_SETEXPR=y +CONFIG_CMD_FILEENV=y diff --git a/buildroot-external/configs/odroid_c2_defconfig b/buildroot-external/configs/odroid_c2_defconfig index f63668bfa..47788b8ac 100644 --- a/buildroot-external/configs/odroid_c2_defconfig +++ b/buildroot-external/configs/odroid_c2_defconfig @@ -19,7 +19,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL_HASSOS_PATH)/scripts/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/odroid-c2 $(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/odroid-c2/hassos-hook.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.11" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.16" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/odroid-c2/kernel.config" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel/hassos.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/docker.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/device-support.config" diff --git a/buildroot-external/configs/odroid_n2_defconfig b/buildroot-external/configs/odroid_n2_defconfig index 29917e47b..2e96fd637 100644 --- a/buildroot-external/configs/odroid_n2_defconfig +++ b/buildroot-external/configs/odroid_n2_defconfig @@ -19,7 +19,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL_HASSOS_PATH)/scripts/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/odroid-n2 $(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/odroid-n2/hassos-hook.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.11" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.16" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/odroid-n2/kernel.config" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel/hassos.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/docker.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/device-support.config" diff --git a/buildroot-external/configs/odroid_xu4_defconfig b/buildroot-external/configs/odroid_xu4_defconfig index b9dca129a..da3edf999 100644 --- a/buildroot-external/configs/odroid_xu4_defconfig +++ b/buildroot-external/configs/odroid_xu4_defconfig @@ -20,7 +20,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL_HASSOS_PATH)/scripts/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/odroid-xu4 $(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/odroid-xu4/hassos-hook.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.11" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.16" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="exynos5422-odroidxu4" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y diff --git a/buildroot-external/kernel/device-support.config b/buildroot-external/kernel/device-support.config index 60a35b114..e824a00c2 100644 --- a/buildroot-external/kernel/device-support.config +++ b/buildroot-external/kernel/device-support.config @@ -8,6 +8,19 @@ CONFIG_USB_SERIAL_FTDI_SIO=m CONFIG_USB_SERIAL_PL2303=m CONFIG_USB_SERIAL_CH341=m CONFIG_USB_SERIAL_TI=m + CONFIG_USB_ACM=m CONFIG_USB_USBNET=m +CONFIG_MEDIA_CEC_SUPPORT=y +CONFIG_SND_USB_AUDIO=m + +CONFIG_BT=y +CONFIG_BT_BREDR=y +CONFIG_BT_LE=y +CONFIG_BT_INTEL=m +CONFIG_BT_BCM=m +CONFIG_BT_RTL=m +CONFIG_BT_HCIBTUSB=y +CONFIG_BT_HCIBTUSB_BCM=m +CONFIG_BT_HCIBTUSB_RTL=m diff --git a/buildroot-external/meta b/buildroot-external/meta index dcbfbbb4c..02b99475c 100644 --- a/buildroot-external/meta +++ b/buildroot-external/meta @@ -1,5 +1,5 @@ VERSION_MAJOR=4 -VERSION_BUILD=0 +VERSION_BUILD=1 HASSOS_NAME="HassOS" HASSOS_ID="hassos" diff --git a/buildroot-external/package/hardkernel-boot/Config.in b/buildroot-external/package/hardkernel-boot/Config.in index 0940e116c..7e1dcac25 100644 --- a/buildroot-external/package/hardkernel-boot/Config.in +++ b/buildroot-external/package/hardkernel-boot/Config.in @@ -26,4 +26,9 @@ config BR2_PACKAGE_HARDKERNEL_BOOT_ODROID_N2 endchoice +config BR2_PACKAGE_HARDKERNEL_BOOT_FIX_MAC + bool "Hardkernel fix mac" + help + Install script to fix the mac address. + endif diff --git a/buildroot-external/package/hardkernel-boot/hardkernel-boot.mk b/buildroot-external/package/hardkernel-boot/hardkernel-boot.mk index 2ff218e7a..4e956e4fe 100644 --- a/buildroot-external/package/hardkernel-boot/hardkernel-boot.mk +++ b/buildroot-external/package/hardkernel-boot/hardkernel-boot.mk @@ -82,7 +82,11 @@ define HARDKERNEL_BOOT_BUILD_CMDS --bl33 $(@D)/fip/bl33.bin.enc \ --ddrfw1 $(@D)/fip/g12b/ddr4_1d.fw \ --ddrfw2 $(@D)/fip/g12b/ddr4_2d.fw \ + --ddrfw3 $(@D)fip/g12b/ddr3_1d.fw \ --ddrfw4 $(@D)/fip/g12b/piei.fw \ + --ddrfw5 $(@D)/fip/g12b/lpddr4_1d.fw \ + --ddrfw6 $(@D)/fip/g12b/lpddr4_2d.fw \ + --ddrfw7 $(@D)/fip/g12b/diag_lpddr4.fw \ --ddrfw8 $(@D)/fip/g12b/aml_ddr.fw \ --level v3 diff --git a/buildroot-external/package/hassos/builder/Dockerfile b/buildroot-external/package/hassos/builder/Dockerfile index 3a2a8a53e..bc6ac64e8 100644 --- a/buildroot-external/package/hassos/builder/Dockerfile +++ b/buildroot-external/package/hassos/builder/Dockerfile @@ -13,7 +13,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ && curl -fsSL https://download.docker.com/linux/ubuntu/gpg | apt-key add - \ && add-apt-repository "deb https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable" \ && apt-get update && apt-get install -y --no-install-recommends \ - docker-ce=5:18.09.6~3-0~ubuntu-bionic \ + docker-ce=5:19.03.5~3-0~ubuntu-bionic \ && rm -rf /var/lib/apt/lists/* COPY hostapp.sh /usr/bin/ diff --git a/buildroot-external/package/qemu-guest-agent/qemu-guest-agent.mk b/buildroot-external/package/qemu-guest-agent/qemu-guest-agent.mk index 713ce9605..5fb0f7d3a 100644 --- a/buildroot-external/package/qemu-guest-agent/qemu-guest-agent.mk +++ b/buildroot-external/package/qemu-guest-agent/qemu-guest-agent.mk @@ -103,7 +103,7 @@ define QEMU_GUEST_AGENT_INSTALL_INIT_SYSTEMD $(INSTALL) -D -m 644 $(QEMU_GUEST_AGENT_PKGDIR)/qemu-guest.service \ $(TARGET_DIR)/usr/lib/systemd/system/qemu-guest.service $(INSTALL) -d $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - ln -fs ../../../../usr/lib/systemd/system/qemu-guest.service \ + ln -fs /usr/lib/systemd/system/qemu-guest.service \ $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/qemu-guest.service endef