u-boot: arm64: Save our modifications to the upstream defconfigs

Run diffconfig from Linux to track our modifications to the old upstream
defconfigs, so we can apply them to the new ones. Restore the original
defconfigs to highlight our changes here, and upstream changes in the
next commit. Done manually, but something like:

  do_diff() {
      ours="$1"
      theirs="$2"
      tree="$3"

      diffconfig \
          src/u-boot/${tree}/configs/${theirs}_defconfig \
          config/u-boot/${ours}/config/default \
          >config/u-boot/${ours}/config/diffconfig

      cp src/u-boot/${tree}/configs/${theirs}_defconfig \
          config/u-boot/${ours}/config/default
  }

  do_diff amd64coreboot    coreboot64        x86_64
  do_diff i386coreboot     coreboot          x86
  do_diff gru_bob          chromebook_bob    default
  do_diff gru_kevin        chromebook_kevin  default
  do_diff qemu_arm64_12mb  qemu_arm64        default

Signed-off-by: Alper Nebi Yasak <alpernebiyasak@gmail.com>

6 files changed, 66 insertions, 42 deletions

diff --git a/config/u-boot/gru_bob/config/default b/config/u-boot/gru_bob/config/default
index 7d22f18f..b2ecfa60 100644
--- a/config/u-boot/gru_bob/config/default
+++ b/config/u-boot/gru_bob/config/default
@@ -2,12 +2,14 @@ CONFIG_ARM=y
 CONFIG_SKIP_LOWLEVEL_INIT=y
 CONFIG_SPL_SYS_DCACHE_OFF=y
 CONFIG_COUNTER_FREQUENCY=24000000
-CONFIG_POSITION_INDEPENDENT=y
 CONFIG_ARCH_ROCKCHIP=y
-CONFIG_TEXT_BASE=0x18000000
+CONFIG_TEXT_BASE=0x00200000
 CONFIG_SPL_GPIO=y
 CONFIG_NR_DRAM_BANKS=1
+CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y
+CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x300000
 CONFIG_SF_DEFAULT_SPEED=20000000
+CONFIG_ENV_OFFSET=0x3F8000
 CONFIG_DEFAULT_DEVICE_TREE="rockchip/rk3399-gru-bob"
 CONFIG_SPL_TEXT_BASE=0xff8c2000
 CONFIG_DM_RESET=y
@@ -27,10 +29,7 @@ CONFIG_SPL_SPI_FLASH_SUPPORT=y
 CONFIG_SPL_SPI=y
 CONFIG_SYS_LOAD_ADDR=0x800800
 CONFIG_DEBUG_UART=y
-CONFIG_REMAKE_ELF=y
 # CONFIG_SPL_FIT_SIGNATURE is not set
-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
@@ -47,9 +46,6 @@ CONFIG_SPL_SPI_LOAD=y
 CONFIG_SYS_SPI_U_BOOT_OFFS=0x40000
 CONFIG_SPL_ATF_NO_PLATFORM_PARAM=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
@@ -58,14 +54,13 @@ 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_MMC_SPEED_MODE_SET=y
 CONFIG_SPL_OF_CONTROL=y
 CONFIG_OF_SPL_REMOVE_PROPS="pinctrl-0 pinctrl-names 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
@@ -77,14 +72,9 @@ 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
-CONFIG_MMC_SDHCI_SDMA=y
 CONFIG_MMC_SDHCI_ROCKCHIP=y
 CONFIG_SF_DEFAULT_BUS=1
 CONFIG_SPI_FLASH_GIGADEVICE=y
@@ -124,9 +114,5 @@ 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
-CONFIG_EFI_VARIABLE_NO_STORE=y
diff --git a/config/u-boot/gru_bob/config/diffconfig b/config/u-boot/gru_bob/config/diffconfig
new file mode 100644
index 00000000..660856dd
--- /dev/null
+++ b/config/u-boot/gru_bob/config/diffconfig
@@ -0,0 +1,23 @@
+-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 91db362c..0fba5912 100644
--- a/config/u-boot/gru_kevin/config/default
+++ b/config/u-boot/gru_kevin/config/default
@@ -2,12 +2,14 @@ CONFIG_ARM=y
 CONFIG_SKIP_LOWLEVEL_INIT=y
 CONFIG_SPL_SYS_DCACHE_OFF=y
 CONFIG_COUNTER_FREQUENCY=24000000
-CONFIG_POSITION_INDEPENDENT=y
 CONFIG_ARCH_ROCKCHIP=y
-CONFIG_TEXT_BASE=0x18000000
+CONFIG_TEXT_BASE=0x00200000
 CONFIG_SPL_GPIO=y
 CONFIG_NR_DRAM_BANKS=1
+CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y
+CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x300000
 CONFIG_SF_DEFAULT_SPEED=20000000
+CONFIG_ENV_OFFSET=0x3F8000
 CONFIG_DEFAULT_DEVICE_TREE="rockchip/rk3399-gru-kevin"
 CONFIG_SPL_TEXT_BASE=0xff8c2000
 CONFIG_DM_RESET=y
@@ -28,10 +30,7 @@ CONFIG_SPL_SPI_FLASH_SUPPORT=y
 CONFIG_SPL_SPI=y
 CONFIG_SYS_LOAD_ADDR=0x800800
 CONFIG_DEBUG_UART=y
-CONFIG_REMAKE_ELF=y
 # CONFIG_SPL_FIT_SIGNATURE is not set
-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
@@ -48,9 +47,6 @@ CONFIG_SPL_SPI_LOAD=y
 CONFIG_SYS_SPI_U_BOOT_OFFS=0x40000
 CONFIG_SPL_ATF_NO_PLATFORM_PARAM=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
@@ -59,14 +55,13 @@ 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_MMC_SPEED_MODE_SET=y
 CONFIG_SPL_OF_CONTROL=y
 CONFIG_OF_SPL_REMOVE_PROPS="pinctrl-0 pinctrl-names 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
@@ -78,14 +73,9 @@ 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
-CONFIG_MMC_SDHCI_SDMA=y
 CONFIG_MMC_SDHCI_ROCKCHIP=y
 CONFIG_SF_DEFAULT_BUS=1
 CONFIG_SPI_FLASH_GIGADEVICE=y
@@ -120,16 +110,10 @@ 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
-CONFIG_EFI_VARIABLE_NO_STORE=y
diff --git a/config/u-boot/gru_kevin/config/diffconfig b/config/u-boot/gru_kevin/config/diffconfig
new file mode 100644
index 00000000..ee3ca1a3
--- /dev/null
+++ b/config/u-boot/gru_kevin/config/diffconfig
@@ -0,0 +1,25 @@
+-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 73411226..088ba39f 100644
--- a/config/u-boot/qemu_arm64_12mb/config/default
+++ b/config/u-boot/qemu_arm64_12mb/config/default
@@ -1,17 +1,18 @@
 CONFIG_ARM=y
 CONFIG_POSITION_INDEPENDENT=y
 CONFIG_ARCH_QEMU=y
-CONFIG_TEXT_BASE=0x50000000
 CONFIG_SYS_MALLOC_LEN=0x1000000
 CONFIG_NR_DRAM_BANKS=1
 CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y
 CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x40200000
 CONFIG_ENV_SIZE=0x40000
+CONFIG_ENV_SECT_SIZE=0x40000
 CONFIG_DEFAULT_DEVICE_TREE="qemu-arm64"
 CONFIG_DEBUG_UART_BASE=0x9000000
 CONFIG_DEBUG_UART_CLOCK=0
 CONFIG_ARMV8_CRYPTO=y
 CONFIG_SYS_LOAD_ADDR=0x40200000
+CONFIG_ENV_ADDR=0x4000000
 CONFIG_PCI=y
 CONFIG_DEBUG_UART=y
 CONFIG_AHCI=y
@@ -21,7 +22,6 @@ 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
@@ -36,6 +36,7 @@ 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
new file mode 100644
index 00000000..447a5ad6
--- /dev/null
+++ b/config/u-boot/qemu_arm64_12mb/config/diffconfig
@@ -0,0 +1,5 @@
+-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