Fix uboot

This commit is contained in:
Pascal Vizeli 2018-08-24 23:05:05 +00:00
parent 514c59796f
commit 9441f6b16e
7 changed files with 12 additions and 23 deletions

View File

@ -1,4 +1,6 @@
# CONFIG_USB_STORAGE is not set # CONFIG_USB_STORAGE is not set
# CONFIG_DOS_PARTITION is not set
CONFIG_DM_VIDEO=y CONFIG_DM_VIDEO=y
CONFIG_CMD_FILEENV=y CONFIG_CMD_FILEENV=y
CONFIG_ENV_IS_IN_MMC=y
CONFIG_ENV_OFFSET=0x25100000 CONFIG_ENV_OFFSET=0x25100000

View File

@ -7,7 +7,7 @@ function hassos_pre_image() {
local spl_img="$(path_spl_img)" local spl_img="$(path_spl_img)"
cp ${BINARIES_DIR}/boot.scr ${BOOT_DATA}/boot.scr 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 cp ${BINARIES_DIR}/meson-gxbb-odroidc2.dtb ${BOOT_DATA}/meson-gxbb-odroidc2.dtb
echo "console=tty0 console=ttyAML0,115200n8" > ${BOOT_DATA}/cmdline.txt echo "console=tty0 console=ttyAML0,115200n8" > ${BOOT_DATA}/cmdline.txt

View File

@ -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_A_LEFT}" || setenv BOOT_A_LEFT 3
test -n "${BOOT_B_LEFT}" || setenv BOOT_B_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}; env import -t ${ramdisk_addr_r} ${filesize};
fi 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" setenv bootargs_hassos "zram.enabled=1 zram.num_devices=3 apparmor=1 security=apparmor cgroup_enable=memory"
# HassOS system A/B # HassOS system A/B
setenv bootargs_a "root=PARTUUID=0d3e0000-06 rootfstype=squashfs ro rootwait" setenv bootargs_a "root=PARTUUID=48617373-06 rootfstype=squashfs ro rootwait"
setenv bootargs_b "root=PARTUUID=0d3e0000-08 rootfstype=squashfs ro rootwait" setenv bootargs_b "root=PARTUUID=48617373-08 rootfstype=squashfs ro rootwait"
usb start usb start

View File

@ -1,20 +1,6 @@
# CONFIG_USB_STORAGE is not set # 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_DOS_PARTITION=y
# CONFIG_ISO_PARTITION is not set
# CONFIG_EFI_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_USB=y
CONFIG_CMD_USB=y CONFIG_CMD_USB=y
CONFIG_DM_USB=y CONFIG_DM_USB=y

View File

@ -1,3 +1,3 @@
# CONFIG_USB_STORAGE is not set # CONFIG_USB_STORAGE is not set
# CONFIG_ENV_FAT_INTERFACE is not set # CONFIG_DOS_PARTITION is not set
# CONFIG_ENV_FAT_DEVICE_AND_PART is not set CONFIG_ENV_IS_IN_MMC=y

View File

@ -5,14 +5,15 @@ CONFIG_DISTRO_DEFAULTS=y
# CONFIG_DISPLAY_BOARDINFO is not set # CONFIG_DISPLAY_BOARDINFO is not set
CONFIG_BOOTDELAY=2 CONFIG_BOOTDELAY=2
CONFIG_SYS_PROMPT="HassOS> " CONFIG_SYS_PROMPT="HassOS> "
# CONFIG_DOS_PARTITION is not set
# CONFIG_ISO_PARTITION is not set # CONFIG_ISO_PARTITION is not set
CONFIG_EFI_PARTITION=y CONFIG_EFI_PARTITION=y
CONFIG_FS_EXT4=y CONFIG_FS_EXT4=y
# CONFIG_ENV_IS_NOWHERE is not set # CONFIG_ENV_IS_NOWHERE is not set
# CONFIG_ENV_IS_IN_FAT is not set # CONFIG_ENV_IS_IN_FAT is not set
# CONFIG_ENV_IS_IN_EXT4 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_CONSOLE_SCROLL_LINES=10
# CONFIG_EFI_LOADER is not set # CONFIG_EFI_LOADER is not set
CONFIG_CMD_SETEXPR=y CONFIG_CMD_SETEXPR=y

View File

@ -72,7 +72,7 @@ BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
BR2_TARGET_UBOOT_CUSTOM_VERSION=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y
BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2018.07" BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2018.07"
BR2_TARGET_UBOOT_BOARD_DEFCONFIG="odroid-c2" 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=y
BR2_TARGET_UBOOT_BOOT_SCRIPT_SOURCE="$(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/odroid-c2/uboot-boot.sh" BR2_TARGET_UBOOT_BOOT_SCRIPT_SOURCE="$(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/odroid-c2/uboot-boot.sh"
BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_DOSFSTOOLS=y