package/boot/uboot-d1/patches/0060-sunxi-Globally-enable-SUPPORT_SPL.patch

   1 From 5838fd3a53e613312d46ab4cb6015a502c4c45d0 Mon Sep 17 00:00:00 2001
   2 From: Zoltan HERPAI <wigyori@uid0.hu>
   3 Date: Tue, 6 Jun 2023 18:07:24 +0000
   4 Subject: [PATCH 60/90] sunxi: Globally enable SUPPORT_SPL
   5
   6 This was already supported by every machine type. It is unlikely that
   7 any new SoC support will be added without SPL support.
   8
   9 Signed-off-by: Samuel Holland <samuel@sholland.org>
  10 Signed-off-by: Zoltan HERPAI <wigyori@uid0.hu>
  11 ---
  12  arch/arm/mach-sunxi/Kconfig | 14 --------------
  13  board/sunxi/Kconfig         |  2 ++
  14  2 files changed, 2 insertions(+), 14 deletions(-)
  15
  16 --- a/arch/arm/mach-sunxi/Kconfig
  17 +++ b/arch/arm/mach-sunxi/Kconfig
  18 @@ -133,7 +133,6 @@ config SUN50I_GEN_H6
  19         select FIT
  20         select SPL_LOAD_FIT
  21         select MMC_SUNXI_HAS_NEW_MODE
  22 -       select SUPPORT_SPL
  23         ---help---
  24         Select this for sunxi SoCs which have H6 like peripherals, clocks
  25         and memory map.
  26 @@ -166,7 +165,6 @@ config MACH_SUNXI_H3_H5
  27         select SUNXI_DRAM_DW
  28         select SUNXI_DRAM_DW_32BIT
  29         select SUNXI_GEN_SUN6I
  30 -       select SUPPORT_SPL
  31
  32  # TODO: try out A80's 8GiB DRAM space
  33  config SUNXI_DRAM_MAX_SIZE
  34 @@ -183,7 +181,6 @@ config MACH_SUNIV
  35         bool "suniv (Allwinner F1C100s/F1C200s/F1C600/R6)"
  36         select CPU_ARM926EJS
  37         select SUNXI_GEN_SUN6I
  38 -       select SUPPORT_SPL
  39         select SKIP_LOWLEVEL_INIT_ONLY
  40         select SPL_SKIP_LOWLEVEL_INIT_ONLY
  41
  42 @@ -192,7 +189,6 @@ config MACH_SUN4I
  43         select CPU_V7A
  44         select DRAM_SUN4I
  45         select SUNXI_GEN_SUN4I
  46 -       select SUPPORT_SPL
  47         imply SPL_SYS_I2C_LEGACY
  48         imply SYS_I2C_LEGACY
  49
  50 @@ -201,7 +197,6 @@ config MACH_SUN5I
  51         select CPU_V7A
  52         select DRAM_SUN4I
  53         select SUNXI_GEN_SUN4I
  54 -       select SUPPORT_SPL
  55         imply SPL_SYS_I2C_LEGACY
  56         imply SYS_I2C_LEGACY
  57
  58 @@ -216,7 +211,6 @@ config MACH_SUN6I
  59         select SPL_I2C
  60         select SUN6I_PRCM
  61         select SUNXI_GEN_SUN6I
  62 -       select SUPPORT_SPL
  63         select SYS_I2C_SUN6I_P2WI
  64         select ARMV7_BOOT_SEC_DEFAULT if OLD_SUNXI_KERNEL_COMPAT
  65
  66 @@ -229,7 +223,6 @@ config MACH_SUN7I
  67         select SPL_ARMV7_SET_CORTEX_SMPEN
  68         select DRAM_SUN4I
  69         select SUNXI_GEN_SUN4I
  70 -       select SUPPORT_SPL
  71         select ARMV7_BOOT_SEC_DEFAULT if OLD_SUNXI_KERNEL_COMPAT
  72         imply SPL_SYS_I2C_LEGACY
  73         imply SYS_I2C_LEGACY
  74 @@ -243,7 +236,6 @@ config MACH_SUN8I_A23
  75         select DRAM_SUN8I_A23
  76         select SPL_I2C
  77         select SUNXI_GEN_SUN6I
  78 -       select SUPPORT_SPL
  79         select SYS_I2C_SUN8I_RSB
  80         select ARMV7_BOOT_SEC_DEFAULT if OLD_SUNXI_KERNEL_COMPAT
  81
  82 @@ -256,7 +248,6 @@ config MACH_SUN8I_A33
  83         select DRAM_SUN8I_A33
  84         select SPL_I2C
  85         select SUNXI_GEN_SUN6I
  86 -       select SUPPORT_SPL
  87         select SYS_I2C_SUN8I_RSB
  88         select ARMV7_BOOT_SEC_DEFAULT if OLD_SUNXI_KERNEL_COMPAT
  89
  90 @@ -268,7 +259,6 @@ config MACH_SUN8I_A83T
  91         select SUNXI_GEN_SUN6I
  92         select MMC_SUNXI_HAS_NEW_MODE
  93         select MMC_SUNXI_HAS_MODE_SWITCH
  94 -       select SUPPORT_SPL
  95         select SYS_I2C_SUN8I_RSB
  96
  97  config MACH_SUN8I_H3
  98 @@ -288,7 +278,6 @@ config MACH_SUN8I_R40
  99         select ARCH_SUPPORT_PSCI
 100         select SUNXI_GEN_SUN6I
 101         select MMC_SUNXI_HAS_NEW_MODE
 102 -       select SUPPORT_SPL
 103         select SUNXI_DRAM_DW
 104         select SUNXI_DRAM_DW_32BIT
 105         imply SPL_SYS_I2C_LEGACY
 106 @@ -302,7 +291,6 @@ config MACH_SUN8I_V3S
 107         select SUNXI_GEN_SUN6I
 108         select SUNXI_DRAM_DW
 109         select SUNXI_DRAM_DW_16BIT
 110 -       select SUPPORT_SPL
 111         select ARMV7_BOOT_SEC_DEFAULT if OLD_SUNXI_KERNEL_COMPAT
 112
 113  config MACH_SUN9I
 114 @@ -313,7 +301,6 @@ config MACH_SUN9I
 115         select SPL_I2C
 116         select SUN6I_PRCM
 117         select SUNXI_GEN_SUN6I
 118 -       select SUPPORT_SPL
 119
 120  config MACH_SUN50I
 121         bool "sun50i (Allwinner A64)"
 122 @@ -322,7 +309,6 @@ config MACH_SUN50I
 123         select SUNXI_DE2
 124         select SUNXI_GEN_SUN6I
 125         select MMC_SUNXI_HAS_NEW_MODE
 126 -       select SUPPORT_SPL
 127         select SUNXI_DRAM_DW
 128         select SUNXI_DRAM_DW_32BIT
 129         select FIT
 130 --- a/board/sunxi/Kconfig
 131 +++ b/board/sunxi/Kconfig
 132 @@ -18,6 +18,7 @@ config BOARD_SUNXI
 133         select SPL_SEPARATE_BSS if SPL
 134         select SUNXI_GPIO if GPIO
 135         select SYS_NS16550 if SERIAL
 136 +       select SUPPORT_SPL
 137         select SYS_RELOC_GD_ENV_ADDR
 138         select USB if DISTRO_DEFAULTS
 139         select USB_KEYBOARD if DISTRO_DEFAULTS && USB_HOST
 140 @@ -31,6 +32,7 @@ config BOARD_SUNXI
 141         imply FIT
 142         imply OF_LIBFDT_OVERLAY
 143         imply PRE_CONSOLE_BUFFER
 144 +       imply SPL
 145         imply SPL_GPIO
 146         imply SPL_LIBCOMMON_SUPPORT
 147         imply SPL_LIBGENERIC_SUPPORT