From 9441f6b16effd3550b307925a5dce2b62d5a5227 Mon Sep 17 00:00:00 2001 From: Pascal Vizeli Date: Fri, 24 Aug 2018 23:05:05 +0000 Subject: [PATCH] Fix uboot --- buildroot-external/board/asus/tinker/uboot.config | 2 ++ .../board/hardkernel/odroid-c2/hassos-hook.sh | 2 +- .../board/hardkernel/odroid-c2/uboot-boot.sh | 6 +++--- .../board/hardkernel/odroid-c2/uboot.config | 14 -------------- buildroot-external/board/raspberrypi/uboot.config | 4 ++-- buildroot-external/bootloader/uboot.config | 5 +++-- buildroot-external/configs/odroid_c2_defconfig | 2 +- 7 files changed, 12 insertions(+), 23 deletions(-) diff --git a/buildroot-external/board/asus/tinker/uboot.config b/buildroot-external/board/asus/tinker/uboot.config index 690c9c65b..e2e1ea464 100644 --- a/buildroot-external/board/asus/tinker/uboot.config +++ b/buildroot-external/board/asus/tinker/uboot.config @@ -1,4 +1,6 @@ # CONFIG_USB_STORAGE is not set +# CONFIG_DOS_PARTITION is not set CONFIG_DM_VIDEO=y CONFIG_CMD_FILEENV=y +CONFIG_ENV_IS_IN_MMC=y CONFIG_ENV_OFFSET=0x25100000 diff --git a/buildroot-external/board/hardkernel/odroid-c2/hassos-hook.sh b/buildroot-external/board/hardkernel/odroid-c2/hassos-hook.sh index b6d11d056..3d3fab208 100755 --- a/buildroot-external/board/hardkernel/odroid-c2/hassos-hook.sh +++ b/buildroot-external/board/hardkernel/odroid-c2/hassos-hook.sh @@ -7,7 +7,7 @@ function hassos_pre_image() { local spl_img="$(path_spl_img)" cp ${BINARIES_DIR}/boot.scr ${BOOT_DATA}/boot.scr - cp ${BOARD_DIR}/boot-env.txt ${BOOT_DATA}/uboot-settings.txt + cp ${BOARD_DIR}/boot-env.txt ${BOOT_DATA}/config.txt cp ${BINARIES_DIR}/meson-gxbb-odroidc2.dtb ${BOOT_DATA}/meson-gxbb-odroidc2.dtb echo "console=tty0 console=ttyAML0,115200n8" > ${BOOT_DATA}/cmdline.txt diff --git a/buildroot-external/board/hardkernel/odroid-c2/uboot-boot.sh b/buildroot-external/board/hardkernel/odroid-c2/uboot-boot.sh index b30c4010f..84e104e69 100644 --- a/buildroot-external/board/hardkernel/odroid-c2/uboot-boot.sh +++ b/buildroot-external/board/hardkernel/odroid-c2/uboot-boot.sh @@ -18,7 +18,7 @@ test -n "${BOOT_ORDER}" || setenv BOOT_ORDER "A B" test -n "${BOOT_A_LEFT}" || setenv BOOT_A_LEFT 3 test -n "${BOOT_B_LEFT}" || setenv BOOT_B_LEFT 3 -if load mmc ${devnum}:1 ${ramdisk_addr_r} uboot-settings.txt; then +if load mmc ${devnum}:1 ${ramdisk_addr_r} config.txt; then env import -t ${ramdisk_addr_r} ${filesize}; fi @@ -30,8 +30,8 @@ setenv bootargs_odroidc2 "${condev} no_console_suspend hdmimode=${m} ${cmode} m_ setenv bootargs_hassos "zram.enabled=1 zram.num_devices=3 apparmor=1 security=apparmor cgroup_enable=memory" # HassOS system A/B -setenv bootargs_a "root=PARTUUID=0d3e0000-06 rootfstype=squashfs ro rootwait" -setenv bootargs_b "root=PARTUUID=0d3e0000-08 rootfstype=squashfs ro rootwait" +setenv bootargs_a "root=PARTUUID=48617373-06 rootfstype=squashfs ro rootwait" +setenv bootargs_b "root=PARTUUID=48617373-08 rootfstype=squashfs ro rootwait" usb start diff --git a/buildroot-external/board/hardkernel/odroid-c2/uboot.config b/buildroot-external/board/hardkernel/odroid-c2/uboot.config index d4727d6e3..dddd4d2c9 100644 --- a/buildroot-external/board/hardkernel/odroid-c2/uboot.config +++ b/buildroot-external/board/hardkernel/odroid-c2/uboot.config @@ -1,20 +1,6 @@ # CONFIG_USB_STORAGE is not set -# CONFIG_ENV_IS_IN_FAT is not set -# CONFIG_ENV_FAT_INTERFACE is not set -# CONFIG_ENV_FAT_DEVICE_AND_PART is not set -# CONFIG_ENV_FAT_FILE is not set -# CONFIG_LOCALVERSION_AUTO is not set -CONFIG_DISTRO_DEFAULTS=y -# CONFIG_EXPERT is not set -# CONFIG_DISPLAY_CPUINFO is not set -# CONFIG_DISPLAY_BOARDINFO is not set -CONFIG_SYS_PROMPT="HassOS> " CONFIG_DOS_PARTITION=y -# CONFIG_ISO_PARTITION is not set # CONFIG_EFI_PARTITION is not set -CONFIG_FS_EXT4=y -CONFIG_CONSOLE_SCROLL_LINES=10 -CONFIG_CMD_SETEXPR=y CONFIG_USB=y CONFIG_CMD_USB=y CONFIG_DM_USB=y diff --git a/buildroot-external/board/raspberrypi/uboot.config b/buildroot-external/board/raspberrypi/uboot.config index 0043ca31e..68813977d 100644 --- a/buildroot-external/board/raspberrypi/uboot.config +++ b/buildroot-external/board/raspberrypi/uboot.config @@ -1,3 +1,3 @@ # CONFIG_USB_STORAGE is not set -# CONFIG_ENV_FAT_INTERFACE is not set -# CONFIG_ENV_FAT_DEVICE_AND_PART is not set +# CONFIG_DOS_PARTITION is not set +CONFIG_ENV_IS_IN_MMC=y diff --git a/buildroot-external/bootloader/uboot.config b/buildroot-external/bootloader/uboot.config index 991646358..9e1419c5a 100644 --- a/buildroot-external/bootloader/uboot.config +++ b/buildroot-external/bootloader/uboot.config @@ -5,14 +5,15 @@ CONFIG_DISTRO_DEFAULTS=y # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_BOOTDELAY=2 CONFIG_SYS_PROMPT="HassOS> " -# CONFIG_DOS_PARTITION is not set # CONFIG_ISO_PARTITION is not set CONFIG_EFI_PARTITION=y CONFIG_FS_EXT4=y # CONFIG_ENV_IS_NOWHERE is not set # CONFIG_ENV_IS_IN_FAT is not set # CONFIG_ENV_IS_IN_EXT4 is not set -CONFIG_ENV_IS_IN_MMC=y +# CONFIG_ENV_FAT_INTERFACE is not set +# CONFIG_ENV_FAT_DEVICE_AND_PART is not set +# CONFIG_ENV_FAT_FILE is not set CONFIG_CONSOLE_SCROLL_LINES=10 # CONFIG_EFI_LOADER is not set CONFIG_CMD_SETEXPR=y diff --git a/buildroot-external/configs/odroid_c2_defconfig b/buildroot-external/configs/odroid_c2_defconfig index a4f424fe6..be979e8bc 100644 --- a/buildroot-external/configs/odroid_c2_defconfig +++ b/buildroot-external/configs/odroid_c2_defconfig @@ -72,7 +72,7 @@ BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2018.07" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="odroid-c2" -BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/odroid-c2/uboot.config" +BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/bootloader/uboot.config $(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/odroid-c2/uboot.config" BR2_TARGET_UBOOT_BOOT_SCRIPT=y BR2_TARGET_UBOOT_BOOT_SCRIPT_SOURCE="$(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/odroid-c2/uboot-boot.sh" BR2_PACKAGE_HOST_DOSFSTOOLS=y