summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--config/u-boot/gru_bob/config/default20
-rw-r--r--config/u-boot/gru_bob/config/diffconfig23
-rw-r--r--config/u-boot/gru_kevin/config/default22
-rw-r--r--config/u-boot/gru_kevin/config/diffconfig25
-rw-r--r--config/u-boot/qemu_arm64_12mb/config/default5
-rw-r--r--config/u-boot/qemu_arm64_12mb/config/diffconfig5
6 files changed, 40 insertions, 60 deletions
diff --git a/config/u-boot/gru_bob/config/default b/config/u-boot/gru_bob/config/default
index 5b8c0d35..2979d634 100644
--- a/config/u-boot/gru_bob/config/default
+++ b/config/u-boot/gru_bob/config/default
@@ -1,11 +1,12 @@
CONFIG_ARM=y
CONFIG_SKIP_LOWLEVEL_INIT=y
CONFIG_COUNTER_FREQUENCY=24000000
+CONFIG_POSITION_INDEPENDENT=y
CONFIG_ARCH_ROCKCHIP=y
+CONFIG_TEXT_BASE=0x18000000
CONFIG_SPL_GPIO=y
CONFIG_NR_DRAM_BANKS=1
CONFIG_SF_DEFAULT_SPEED=20000000
-CONFIG_ENV_OFFSET=0x3F8000
CONFIG_DEFAULT_DEVICE_TREE="rockchip/rk3399-gru-bob"
CONFIG_DM_RESET=y
CONFIG_ROCKCHIP_RK3399=y
@@ -18,6 +19,10 @@ CONFIG_DEBUG_UART_CLOCK=24000000
CONFIG_SPL_SPI_FLASH_SUPPORT=y
CONFIG_SPL_SPI=y
CONFIG_DEBUG_UART=y
+CONFIG_REMAKE_ELF=y
+CONFIG_EFI_VARIABLE_NO_STORE=y
+CONFIG_BOOTCOMMAND="bootflow scan -l; if bootflow menu; then cls; bootflow boot; fi"
+CONFIG_USE_PREBOOT=y
CONFIG_DEFAULT_FDT_FILE="rockchip/rk3399-gru-bob.dtb"
# CONFIG_DISPLAY_CPUINFO is not set
CONFIG_DISPLAY_BOARDINFO_LATE=y
@@ -37,21 +42,25 @@ CONFIG_SPL_ATF_NO_PLATFORM_PARAM=y
CONFIG_TPL=y
CONFIG_TPL_GPIO=y
CONFIG_CMD_BOOTZ=y
+CONFIG_CMD_BOOTEFI_SELFTEST=y
+CONFIG_CMD_BOOTMENU=y
+CONFIG_CMD_NVEDIT_EFI=y
CONFIG_CMD_GPIO=y
CONFIG_CMD_GPT=y
CONFIG_CMD_I2C=y
CONFIG_CMD_MMC=y
+CONFIG_MMC_SPEED_MODE_SET=y
CONFIG_CMD_SF_TEST=y
CONFIG_CMD_SPI=y
CONFIG_CMD_USB=y
# CONFIG_CMD_SETEXPR is not set
+CONFIG_CMD_EFIDEBUG=y
CONFIG_CMD_TIME=y
CONFIG_CMD_PMIC=y
CONFIG_CMD_REGULATOR=y
CONFIG_CMD_LOG=y
CONFIG_SPL_OF_CONTROL=y
CONFIG_OF_SPL_REMOVE_PROPS="clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents"
-CONFIG_ENV_IS_IN_MMC=y
CONFIG_SYS_RELOC_GD_ENV_ADDR=y
CONFIG_ROCKCHIP_GPIO=y
CONFIG_I2C_CROS_EC_TUNNEL=y
@@ -63,6 +72,10 @@ CONFIG_CROS_EC=y
CONFIG_CROS_EC_SPI=y
CONFIG_PWRSEQ=y
CONFIG_MMC_PWRSEQ=y
+CONFIG_MMC_IO_VOLTAGE=y
+CONFIG_MMC_UHS_SUPPORT=y
+CONFIG_MMC_HS400_ES_SUPPORT=y
+CONFIG_MMC_HS400_SUPPORT=y
CONFIG_MMC_DW=y
CONFIG_MMC_DW_ROCKCHIP=y
CONFIG_MMC_SDHCI=y
@@ -106,5 +119,8 @@ CONFIG_VIDEO_ROCKCHIP=y
CONFIG_VIDEO_ROCKCHIP_MAX_XRES=1280
CONFIG_VIDEO_ROCKCHIP_MAX_YRES=800
CONFIG_DISPLAY_ROCKCHIP_EDP=y
+# CONFIG_BINMAN_FDT is not set
+CONFIG_PANIC_HANG=y
CONFIG_CMD_DHRYSTONE=y
CONFIG_ERRNO_STR=y
+# CONFIG_HEXDUMP is not set
diff --git a/config/u-boot/gru_bob/config/diffconfig b/config/u-boot/gru_bob/config/diffconfig
deleted file mode 100644
index 660856dd..00000000
--- a/config/u-boot/gru_bob/config/diffconfig
+++ /dev/null
@@ -1,23 +0,0 @@
--CUSTOM_SYS_INIT_SP_ADDR 0x300000
--ENV_IS_IN_MMC y
--ENV_OFFSET 0x3F8000
--HAS_CUSTOM_SYS_INIT_SP_ADDR y
- TEXT_BASE 0x00200000 -> 0x18000000
-+BINMAN_FDT n
-+BOOTCOMMAND "bootflow scan -l; if bootflow menu; then cls; bootflow boot; fi"
-+CMD_BOOTEFI_SELFTEST y
-+CMD_BOOTMENU y
-+CMD_EFIDEBUG y
-+CMD_NVEDIT_EFI y
-+EFI_VARIABLE_NO_STORE y
-+HEXDUMP n
-+MMC_HS400_ES_SUPPORT y
-+MMC_HS400_SUPPORT y
-+MMC_IO_VOLTAGE y
-+MMC_SDHCI_SDMA y
-+MMC_SPEED_MODE_SET y
-+MMC_UHS_SUPPORT y
-+PANIC_HANG y
-+POSITION_INDEPENDENT y
-+REMAKE_ELF y
-+USE_PREBOOT y
diff --git a/config/u-boot/gru_kevin/config/default b/config/u-boot/gru_kevin/config/default
index a29a04aa..df3a0747 100644
--- a/config/u-boot/gru_kevin/config/default
+++ b/config/u-boot/gru_kevin/config/default
@@ -1,11 +1,12 @@
CONFIG_ARM=y
CONFIG_SKIP_LOWLEVEL_INIT=y
CONFIG_COUNTER_FREQUENCY=24000000
+CONFIG_POSITION_INDEPENDENT=y
CONFIG_ARCH_ROCKCHIP=y
+CONFIG_TEXT_BASE=0x18000000
CONFIG_SPL_GPIO=y
CONFIG_NR_DRAM_BANKS=1
CONFIG_SF_DEFAULT_SPEED=20000000
-CONFIG_ENV_OFFSET=0x3F8000
CONFIG_DEFAULT_DEVICE_TREE="rockchip/rk3399-gru-kevin"
CONFIG_DM_RESET=y
CONFIG_ROCKCHIP_RK3399=y
@@ -19,6 +20,10 @@ CONFIG_DEBUG_UART_CLOCK=24000000
CONFIG_SPL_SPI_FLASH_SUPPORT=y
CONFIG_SPL_SPI=y
CONFIG_DEBUG_UART=y
+CONFIG_REMAKE_ELF=y
+CONFIG_EFI_VARIABLE_NO_STORE=y
+CONFIG_BOOTCOMMAND="bootflow scan -l; if bootflow menu; then cls; bootflow boot; fi"
+CONFIG_USE_PREBOOT=y
CONFIG_DEFAULT_FDT_FILE="rockchip/rk3399-gru-kevin.dtb"
# CONFIG_DISPLAY_CPUINFO is not set
CONFIG_DISPLAY_BOARDINFO_LATE=y
@@ -38,21 +43,25 @@ CONFIG_SPL_ATF_NO_PLATFORM_PARAM=y
CONFIG_TPL=y
CONFIG_TPL_GPIO=y
CONFIG_CMD_BOOTZ=y
+CONFIG_CMD_BOOTEFI_SELFTEST=y
+CONFIG_CMD_BOOTMENU=y
+CONFIG_CMD_NVEDIT_EFI=y
CONFIG_CMD_GPIO=y
CONFIG_CMD_GPT=y
CONFIG_CMD_I2C=y
CONFIG_CMD_MMC=y
+CONFIG_MMC_SPEED_MODE_SET=y
CONFIG_CMD_SF_TEST=y
CONFIG_CMD_SPI=y
CONFIG_CMD_USB=y
# CONFIG_CMD_SETEXPR is not set
+CONFIG_CMD_EFIDEBUG=y
CONFIG_CMD_TIME=y
CONFIG_CMD_PMIC=y
CONFIG_CMD_REGULATOR=y
CONFIG_CMD_LOG=y
CONFIG_SPL_OF_CONTROL=y
CONFIG_OF_SPL_REMOVE_PROPS="clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents"
-CONFIG_ENV_IS_IN_MMC=y
CONFIG_SYS_RELOC_GD_ENV_ADDR=y
CONFIG_ROCKCHIP_GPIO=y
CONFIG_I2C_CROS_EC_TUNNEL=y
@@ -64,6 +73,10 @@ CONFIG_CROS_EC=y
CONFIG_CROS_EC_SPI=y
CONFIG_PWRSEQ=y
CONFIG_MMC_PWRSEQ=y
+CONFIG_MMC_IO_VOLTAGE=y
+CONFIG_MMC_UHS_SUPPORT=y
+CONFIG_MMC_HS400_ES_SUPPORT=y
+CONFIG_MMC_HS400_SUPPORT=y
CONFIG_MMC_DW=y
CONFIG_MMC_DW_ROCKCHIP=y
CONFIG_MMC_SDHCI=y
@@ -102,10 +115,15 @@ CONFIG_USB_ETHER_MCS7830=y
CONFIG_USB_ETHER_RTL8152=y
CONFIG_USB_ETHER_SMSC95XX=y
CONFIG_VIDEO=y
+# CONFIG_VIDEO_FONT_8X16 is not set
+CONFIG_VIDEO_FONT_16X32=y
CONFIG_DISPLAY=y
CONFIG_VIDEO_ROCKCHIP=y
CONFIG_VIDEO_ROCKCHIP_MAX_XRES=2400
CONFIG_VIDEO_ROCKCHIP_MAX_YRES=1600
CONFIG_DISPLAY_ROCKCHIP_EDP=y
+# CONFIG_BINMAN_FDT is not set
+CONFIG_PANIC_HANG=y
CONFIG_CMD_DHRYSTONE=y
CONFIG_ERRNO_STR=y
+# CONFIG_HEXDUMP is not set
diff --git a/config/u-boot/gru_kevin/config/diffconfig b/config/u-boot/gru_kevin/config/diffconfig
deleted file mode 100644
index ee3ca1a3..00000000
--- a/config/u-boot/gru_kevin/config/diffconfig
+++ /dev/null
@@ -1,25 +0,0 @@
--CUSTOM_SYS_INIT_SP_ADDR 0x300000
--ENV_IS_IN_MMC y
--ENV_OFFSET 0x3F8000
--HAS_CUSTOM_SYS_INIT_SP_ADDR y
- TEXT_BASE 0x00200000 -> 0x18000000
-+BINMAN_FDT n
-+BOOTCOMMAND "bootflow scan -l; if bootflow menu; then cls; bootflow boot; fi"
-+CMD_BOOTEFI_SELFTEST y
-+CMD_BOOTMENU y
-+CMD_EFIDEBUG y
-+CMD_NVEDIT_EFI y
-+EFI_VARIABLE_NO_STORE y
-+HEXDUMP n
-+MMC_HS400_ES_SUPPORT y
-+MMC_HS400_SUPPORT y
-+MMC_IO_VOLTAGE y
-+MMC_SDHCI_SDMA y
-+MMC_SPEED_MODE_SET y
-+MMC_UHS_SUPPORT y
-+PANIC_HANG y
-+POSITION_INDEPENDENT y
-+REMAKE_ELF y
-+USE_PREBOOT y
-+VIDEO_FONT_16X32 y
-+VIDEO_FONT_8X16 n
diff --git a/config/u-boot/qemu_arm64_12mb/config/default b/config/u-boot/qemu_arm64_12mb/config/default
index 03028c76..972651b3 100644
--- a/config/u-boot/qemu_arm64_12mb/config/default
+++ b/config/u-boot/qemu_arm64_12mb/config/default
@@ -1,18 +1,17 @@
CONFIG_ARM=y
CONFIG_POSITION_INDEPENDENT=y
CONFIG_ARCH_QEMU=y
+CONFIG_TEXT_BASE=0x50000000
CONFIG_SYS_MALLOC_LEN=0x1000000
CONFIG_BLOBLIST_SIZE_RELOC=0x2000
CONFIG_NR_DRAM_BANKS=1
CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x40200000
CONFIG_ENV_SIZE=0x40000
-CONFIG_ENV_SECT_SIZE=0x40000
CONFIG_DEFAULT_DEVICE_TREE="qemu-arm64"
CONFIG_SYS_LOAD_ADDR=0x40200000
CONFIG_DEBUG_UART_BASE=0x9000000
CONFIG_DEBUG_UART_CLOCK=0
CONFIG_ARMV8_CRYPTO=y
-CONFIG_ENV_ADDR=0x4000000
CONFIG_PCI=y
CONFIG_DEBUG_UART=y
CONFIG_AHCI=y
@@ -23,6 +22,7 @@ CONFIG_FIT_VERBOSE=y
CONFIG_FIT_BEST_MATCH=y
CONFIG_BOOTSTD_FULL=y
CONFIG_LEGACY_IMAGE_FORMAT=y
+CONFIG_BOOTCOMMAND="bootflow scan -l; if bootflow menu; then cls; bootflow boot; fi"
CONFIG_USE_PREBOOT=y
# CONFIG_DISPLAY_CPUINFO is not set
# CONFIG_DISPLAY_BOARDINFO is not set
@@ -38,7 +38,6 @@ CONFIG_CMD_PCI=y
CONFIG_CMD_EFIDEBUG=y
CONFIG_CMD_TPM=y
CONFIG_CMD_MTDPARTS=y
-CONFIG_ENV_IS_IN_FLASH=y
CONFIG_SCSI_AHCI=y
CONFIG_AHCI_PCI=y
CONFIG_DFU_TFTP=y
diff --git a/config/u-boot/qemu_arm64_12mb/config/diffconfig b/config/u-boot/qemu_arm64_12mb/config/diffconfig
deleted file mode 100644
index 447a5ad6..00000000
--- a/config/u-boot/qemu_arm64_12mb/config/diffconfig
+++ /dev/null
@@ -1,5 +0,0 @@
--ENV_ADDR 0x4000000
--ENV_IS_IN_FLASH y
--ENV_SECT_SIZE 0x40000
-+BOOTCOMMAND "bootflow scan -l; if bootflow menu; then cls; bootflow boot; fi"
-+TEXT_BASE 0x50000000
generated by cgit v1.2.1 (git 2.18.0) at 2025-05-01 05:41:31 +0000