Skip to contentSkip to conversation

sunxi: Enable CONFIG_SPL_STACK_R

PATCH New Hans de Goede 2 participants 4 messages Sep 14, 2015 – Sep 15, 2015

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH v2 1/2 sunxi: Enable CONFIG_SPL_STACK_R

Select CONFIG_SPL_STACK_R for sunxi boards, this gives us much more room on the stack once we've the DRAM running.

Besides being a good change to have on itself, this also paves the way for switching to using malloc_simple in the SPL which cuts of close to 4KiB of the SPL size.

---
Changes in v2:
-Replace comment about CONFIG_SPL_STACK_R_ADDR in sunxi-common.h with
the text suggested by Ian

---
 arch/arm/Kconfig                             | 1 +
 configs/A10-OLinuXino-Lime_defconfig         | 1 +
 configs/A10s-OLinuXino-M_defconfig           | 1 +
 configs/A13-OLinuXinoM_defconfig             | 1 +
 configs/A13-OLinuXino_defconfig              | 1 +
 configs/A20-OLinuXino-Lime2_defconfig        | 1 +
 configs/A20-OLinuXino-Lime_defconfig         | 1 +
 configs/A20-OLinuXino_MICRO_defconfig        | 1 +
 configs/A20-Olimex-SOM-EVB_defconfig         | 1 +
 configs/Ainol_AW1_defconfig                  | 1 +
 configs/Ampe_A76_defconfig                   | 1 +
 configs/Auxtek-T003_defconfig                | 1 +
 configs/Auxtek-T004_defconfig                | 1 +
 configs/Bananapi_defconfig                   | 1 +
 configs/Bananapro_defconfig                  | 1 +
 configs/CSQ_CS908_defconfig                  | 1 +
 configs/Chuwi_V7_CW0825_defconfig            | 1 +
 configs/Colombus_defconfig                   | 1 +
 configs/Cubieboard2_defconfig                | 1 +
 configs/Cubieboard_defconfig                 | 1 +
 configs/Cubietruck_defconfig                 | 1 +
 configs/Et_q8_v1_6_defconfig                 | 1 +
 configs/Hummingbird_A31_defconfig            | 1 +
 configs/Hyundai_A7HD_defconfig               | 1 +
 configs/Ippo_q8h_v1_2_a33_1024x600_defconfig | 1 +
 configs/Ippo_q8h_v1_2_defconfig              | 1 +
 configs/Ippo_q8h_v5_defconfig                | 1 +
 configs/Linksprite_pcDuino3_Nano_defconfig   | 1 +
 configs/Linksprite_pcDuino3_defconfig        | 1 +
 configs/Linksprite_pcDuino_defconfig         | 1 +
 configs/MK808C_defconfig                     | 1 +
 configs/MSI_Primo73_defconfig                | 1 +
 configs/MSI_Primo81_defconfig                | 1 +
 configs/Marsboard_A10_defconfig              | 1 +
 configs/Mele_A1000G_quad_defconfig           | 1 +
 configs/Mele_A1000_defconfig                 | 1 +
 configs/Mele_I7_defconfig                    | 1 +
 configs/Mele_M3_defconfig                    | 1 +
 configs/Mele_M5_defconfig                    | 1 +
 configs/Mele_M9_defconfig                    | 1 +
 configs/Merrii_A80_Optimus_defconfig         | 1 +
 configs/Mini-X_defconfig                     | 1 +
 configs/Orangepi_defconfig                   | 1 +
 configs/Orangepi_mini_defconfig              | 1 +
 configs/Sinlinx_SinA33_defconfig             | 1 +
 configs/TZX-Q8-713B7_defconfig               | 1 +
 configs/UTOO_P66_defconfig                   | 1 +
 configs/Wexler_TAB7200_defconfig             | 1 +
 configs/Wits_Pro_A20_DKT_defconfig           | 1 +
 configs/Wobo_i5_defconfig                    | 1 +
 configs/Yones_Toptech_BD1078_defconfig       | 1 +
 configs/ba10_tv_box_defconfig                | 1 +
 configs/forfun_q88db_defconfig               | 1 +
 configs/ga10h_v1_1_defconfig                 | 1 +
 configs/gt90h_v4_defconfig                   | 1 +
 configs/i12-tvbox_defconfig                  | 1 +
 configs/iNet_3F_defconfig                    | 1 +
 configs/iNet_3W_defconfig                    | 1 +
 configs/iNet_86VS_defconfig                  | 1 +
 configs/inet1_defconfig                      | 1 +
 configs/inet97fv2_defconfig                  | 1 +
 configs/inet98v_rev2_defconfig               | 1 +
 configs/inet9f_rev03_defconfig               | 1 +
 configs/jesurun_q5_defconfig                 | 1 +
 configs/mixtile_loftq_defconfig              | 1 +
 configs/mk802_a10s_defconfig                 | 1 +
 configs/mk802_defconfig                      | 1 +
 configs/mk802ii_defconfig                    | 1 +
 configs/pov_protab2_ips9_defconfig           | 1 +
 configs/q8_a13_tablet_defconfig              | 1 +
 configs/r7-tv-dongle_defconfig               | 1 +
 configs/sunxi_Gemei_G9_defconfig             | 1 +
 include/configs/sunxi-common.h               | 8 ++++++++
 73 files changed, 80 insertions(+)
arch/arm/Kconfig +1 -0
index 57c48d5..a862a7a 100644
@@ -518,6 +518,7 @@ config ARCH_SUNXI
 	select DM_USB
 	select OF_CONTROL
 	select OF_SEPARATE
+	select SPL_STACK_R
 	select USB
 	select USB_STORAGE
 	select USB_KEYBOARD
configs/A10-OLinuXino-Lime_defconfig +1 -0
index ee219f8..08f69d6 100644
@@ -13,3 +13,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_EMAC,AHCI,SATAPWR=SUNXI_GPC(3)"
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_FPGA is not set
 CONFIG_USB_EHCI_HCD=y
+CONFIG_SPL_STACK_R_ADDR=0x4fe00000
configs/A10s-OLinuXino-M_defconfig +1 -0
index 7783c7d..fea71a0 100644
@@ -14,3 +14,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AXP152_POWER,SUNXI_EMAC"
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_FPGA is not set
 CONFIG_USB_EHCI_HCD=y
+CONFIG_SPL_STACK_R_ADDR=0x4fe00000
configs/A13-OLinuXinoM_defconfig +1 -0
index ccf35c7..8445143 100644
@@ -18,3 +18,4 @@ CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=2"
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_FPGA is not set
 CONFIG_USB_EHCI_HCD=y
+CONFIG_SPL_STACK_R_ADDR=0x4fe00000
configs/A13-OLinuXino_defconfig +1 -0
index 1f68d98..fcaa822 100644
@@ -19,3 +19,4 @@ CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=2,AXP209_POWER"
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_FPGA is not set
 CONFIG_USB_EHCI_HCD=y
+CONFIG_SPL_STACK_R_ADDR=0x4fe00000
configs/A20-OLinuXino-Lime2_defconfig +1 -0
index c9d0f47..ed56de8 100644
@@ -14,3 +14,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_GMAC,RGMII,AHCI,SATAPWR=SUNXI_GPC(3
 # CONFIG_CMD_FPGA is not set
 CONFIG_ETH_DESIGNWARE=y
 CONFIG_USB_EHCI_HCD=y
+CONFIG_SPL_STACK_R_ADDR=0x4fe00000
configs/A20-OLinuXino-Lime_defconfig +1 -0
index 4a257b3..cc0a47c 100644
@@ -12,3 +12,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_GMAC,AHCI,SATAPWR=SUNXI_GPC(3)"
 # CONFIG_CMD_FPGA is not set
 CONFIG_ETH_DESIGNWARE=y
 CONFIG_USB_EHCI_HCD=y
+CONFIG_SPL_STACK_R_ADDR=0x4fe00000
configs/A20-OLinuXino_MICRO_defconfig +1 -0
index a7f1395..5feee69 100644
@@ -15,3 +15,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_GMAC,AHCI,SATAPWR=SUNXI_GPB(8)"
 # CONFIG_CMD_FPGA is not set
 CONFIG_ETH_DESIGNWARE=y
 CONFIG_USB_EHCI_HCD=y
+CONFIG_SPL_STACK_R_ADDR=0x4fe00000
configs/A20-Olimex-SOM-EVB_defconfig +1 -0
index e8c3d18..ec0d1e5 100644
@@ -14,3 +14,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_GMAC,RGMII,AHCI,SATAPWR=SUNXI_GPC(3
 # CONFIG_CMD_FPGA is not set
 CONFIG_ETH_DESIGNWARE=y
 CONFIG_USB_EHCI_HCD=y
+CONFIG_SPL_STACK_R_ADDR=0x4fe00000
configs/Ainol_AW1_defconfig +1 -0
index 7c41aa8..70552e8 100644
@@ -19,3 +19,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER"
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_FPGA is not set
 CONFIG_USB_MUSB_HOST=y
+CONFIG_SPL_STACK_R_ADDR=0x4fe00000
configs/Ampe_A76_defconfig +1 -0
index 57ff52d..a02c8a35 100644
@@ -20,3 +20,4 @@ CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=2,AXP209_POWER"
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_FPGA is not set
 CONFIG_USB_MUSB_HOST=y
+CONFIG_SPL_STACK_R_ADDR=0x4fe00000
configs/Auxtek-T003_defconfig +1 -0
index b9692dc..769f66d 100644
@@ -13,3 +13,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AXP152_POWER"
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_FPGA is not set
 CONFIG_USB_EHCI_HCD=y
+CONFIG_SPL_STACK_R_ADDR=0x4fe00000
configs/Auxtek-T004_defconfig +1 -0
index c019176..1892f02 100644
@@ -11,3 +11,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AXP152_POWER"
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_FPGA is not set
 CONFIG_USB_EHCI_HCD=y
+CONFIG_SPL_STACK_R_ADDR=0x4fe00000
configs/Bananapi_defconfig +1 -0
index 560295f..13d0377 100644
@@ -13,3 +13,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_GMAC,RGMII,MACPWR=SUNXI_GPH(23),AHC
 # CONFIG_CMD_FPGA is not set
 CONFIG_ETH_DESIGNWARE=y
 CONFIG_USB_EHCI_HCD=y
+CONFIG_SPL_STACK_R_ADDR=0x4fe00000
configs/Bananapro_defconfig +1 -0
index 346db34..b2a3261 100644
@@ -15,3 +15,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_GMAC,RGMII,MACPWR=SUNXI_GPH(23),AHC
 # CONFIG_CMD_FPGA is not set
 CONFIG_ETH_DESIGNWARE=y
 CONFIG_USB_EHCI_HCD=y
+CONFIG_SPL_STACK_R_ADDR=0x4fe00000
configs/CSQ_CS908_defconfig +1 -0
index 7c8eca8..a1453b4 100644
@@ -16,3 +16,4 @@ CONFIG_AXP221_DLDO1_VOLT=3300
 CONFIG_AXP221_ALDO1_VOLT=3300
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_MUSB_HOST=y
+CONFIG_SPL_STACK_R_ADDR=0x4fe00000
configs/Chuwi_V7_CW0825_defconfig +1 -0
index 7f1c4eb..5f4c87b 100644
@@ -22,3 +22,4 @@ CONFIG_VIDEO_LCD_SPI_CS="PA0"
 CONFIG_VIDEO_LCD_SPI_SCLK="PA1"
 CONFIG_VIDEO_LCD_SPI_MOSI="PA2"
 CONFIG_USB_MUSB_HOST=y
+CONFIG_SPL_STACK_R_ADDR=0x4fe00000
configs/Colombus_defconfig +1 -0
index 35f644a..61d98a2 100644
@@ -25,3 +25,4 @@ CONFIG_ETH_DESIGNWARE=y
 CONFIG_AXP221_ALDO1_VOLT=3300
 CONFIG_AXP221_ELDO3_VOLT=1800
 CONFIG_USB_EHCI_HCD=y
+CONFIG_SPL_STACK_R_ADDR=0x4fe00000
configs/Cubieboard2_defconfig +1 -0
index 9bcaed1..50fe24e 100644
@@ -12,3 +12,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_GMAC,AHCI,SATAPWR=SUNXI_GPB(8)"
 # CONFIG_CMD_FPGA is not set
 CONFIG_ETH_DESIGNWARE=y
 CONFIG_USB_EHCI_HCD=y
+CONFIG_SPL_STACK_R_ADDR=0x4fe00000
configs/Cubieboard_defconfig +1 -0
index bbda5bf..eec0863 100644
@@ -11,3 +11,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_EMAC,AHCI,SATAPWR=SUNXI_GPB(8)"
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_FPGA is not set
 CONFIG_USB_EHCI_HCD=y
+CONFIG_SPL_STACK_R_ADDR=0x4fe00000
configs/Cubietruck_defconfig +1 -0
index e1b76ce..fdb78c1 100644
@@ -14,3 +14,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_GMAC,RGMII,AHCI,SATAPWR=SUNXI_GPH(1
 # CONFIG_CMD_FPGA is not set
 CONFIG_ETH_DESIGNWARE=y
 CONFIG_USB_EHCI_HCD=y
+CONFIG_SPL_STACK_R_ADDR=0x4fe00000
configs/Et_q8_v1_6_defconfig +1 -0
index 65b8e1a..055b495 100644
@@ -21,3 +21,4 @@ CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=5"
 CONFIG_AXP221_DLDO1_VOLT=3300
 CONFIG_AXP221_ALDO1_VOLT=3000
 CONFIG_USB_MUSB_HOST=y
+CONFIG_SPL_STACK_R_ADDR=0x4fe00000
configs/Hummingbird_A31_defconfig +1 -0
index 35c746c..2695eb8 100644
@@ -16,3 +16,4 @@ CONFIG_SYS_EXTRA_OPTIONS="SUNXI_GMAC,RGMII,MACPWR=SUNXI_GPA(21)"
 CONFIG_ETH_DESIGNWARE=y
 CONFIG_AXP221_ALDO1_VOLT=3300
 CONFIG_USB_EHCI_HCD=y
+CONFIG_SPL_STACK_R_ADDR=0x4fe00000
configs/Hyundai_A7HD_defconfig +1 -0
index 9ef06a7..a571261 100644
@@ -20,3 +20,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER"
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_FPGA is not set
 CONFIG_USB_MUSB_HOST=y
+CONFIG_SPL_STACK_R_ADDR=0x4fe00000
configs/Ippo_q8h_v1_2_a33_1024x600_defconfig +1 -0
index 40ccf8f..4d607d6 100644
@@ -22,3 +22,4 @@ CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=5"
 CONFIG_AXP221_DLDO1_VOLT=3300
 CONFIG_AXP221_ALDO1_VOLT=3000
 CONFIG_USB_MUSB_HOST=y
+CONFIG_SPL_STACK_R_ADDR=0x4fe00000
configs/Ippo_q8h_v1_2_defconfig +1 -0
index 5b49c44..7d79bcb 100644
@@ -22,3 +22,4 @@ CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=5"
 CONFIG_AXP221_DLDO1_VOLT=3300
 CONFIG_AXP221_ALDO1_VOLT=3000
 CONFIG_USB_MUSB_HOST=y
+CONFIG_SPL_STACK_R_ADDR=0x4fe00000
configs/Ippo_q8h_v5_defconfig +1 -0
index 5316860..80ed134 100644
@@ -22,3 +22,4 @@ CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=5"
 CONFIG_AXP221_DLDO1_VOLT=3300
 CONFIG_AXP221_ALDO1_VOLT=3000
 CONFIG_USB_MUSB_HOST=y
+CONFIG_SPL_STACK_R_ADDR=0x4fe00000
configs/Linksprite_pcDuino3_Nano_defconfig +1 -0
index 0b64b60..3259020 100644
@@ -14,3 +14,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_GMAC,RGMII,AHCI,SATAPWR=SUNXI_GPH(2
 # CONFIG_CMD_FPGA is not set
 CONFIG_ETH_DESIGNWARE=y
 CONFIG_USB_EHCI_HCD=y
+CONFIG_SPL_STACK_R_ADDR=0x4fe00000
configs/Linksprite_pcDuino3_defconfig +1 -0
index cced032..24c6bd6 100644
@@ -12,3 +12,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_GMAC,AHCI,SATAPWR=SUNXI_GPH(2)"
 # CONFIG_CMD_FPGA is not set
 CONFIG_ETH_DESIGNWARE=y
 CONFIG_USB_EHCI_HCD=y
+CONFIG_SPL_STACK_R_ADDR=0x4fe00000
configs/Linksprite_pcDuino_defconfig +1 -0
index de44890..1ff3bfe 100644
@@ -10,3 +10,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_EMAC"
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_FPGA is not set
 CONFIG_USB_EHCI_HCD=y
+CONFIG_SPL_STACK_R_ADDR=0x4fe00000
configs/MK808C_defconfig +1 -0
index 5e37485..49c5625 100644
@@ -10,3 +10,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER"
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_FPGA is not set
 CONFIG_USB_EHCI_HCD=y
+CONFIG_SPL_STACK_R_ADDR=0x4fe00000
configs/MSI_Primo73_defconfig +1 -0
index a60ce34..9dd1f55 100644
@@ -14,3 +14,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER"
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_FPGA is not set
+CONFIG_SPL_STACK_R_ADDR=0x4fe00000
configs/MSI_Primo81_defconfig +1 -0
index 3b8e043..6969b3f 100644
@@ -24,3 +24,4 @@ CONFIG_VIDEO_LCD_SPI_SCLK="PH10"
 CONFIG_VIDEO_LCD_SPI_MOSI="PH11"
 CONFIG_VIDEO_LCD_SPI_MISO="PH12"
 CONFIG_USB_MUSB_HOST=y
+CONFIG_SPL_STACK_R_ADDR=0x4fe00000
configs/Marsboard_A10_defconfig +1 -0
index 4933659..9f98ccc 100644
@@ -9,3 +9,4 @@ CONFIG_SYS_EXTRA_OPTIONS="SUNXI_EMAC,AHCI"
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_FPGA is not set
 CONFIG_USB_EHCI_HCD=y
+CONFIG_SPL_STACK_R_ADDR=0x4fe00000
configs/Mele_A1000G_quad_defconfig +1 -0
index 5e31ef6..b02febb 100644
@@ -18,3 +18,4 @@ CONFIG_AXP221_DLDO4_VOLT=3300
 CONFIG_AXP221_ALDO1_VOLT=3300
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_MUSB_HOST=y
+CONFIG_SPL_STACK_R_ADDR=0x4fe00000
configs/Mele_A1000_defconfig +1 -0
index b983c8c..5905e4f 100644
@@ -11,3 +11,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_EMAC,MACPWR=SUNXI_GPH(15),AHCI"
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_FPGA is not set
 CONFIG_USB_EHCI_HCD=y
+CONFIG_SPL_STACK_R_ADDR=0x4fe00000
configs/Mele_I7_defconfig +1 -0
index 774a92f..23ea80b 100644
@@ -17,3 +17,4 @@ CONFIG_AXP221_DLDO1_VOLT=3300
 CONFIG_AXP221_DLDO4_VOLT=3300
 CONFIG_AXP221_ALDO1_VOLT=3300
 CONFIG_USB_EHCI_HCD=y
+CONFIG_SPL_STACK_R_ADDR=0x4fe00000
configs/Mele_M3_defconfig +1 -0
index 5c9796a..498e8b7 100644
@@ -15,3 +15,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_GMAC"
 # CONFIG_CMD_FPGA is not set
 CONFIG_ETH_DESIGNWARE=y
 CONFIG_USB_EHCI_HCD=y
+CONFIG_SPL_STACK_R_ADDR=0x4fe00000
configs/Mele_M5_defconfig +1 -0
index 0d1ba15..aa6070d 100644
@@ -14,3 +14,4 @@ CONFIG_SYS_EXTRA_OPTIONS="SUNXI_GMAC,AHCI,STATUSLED=234"
 # CONFIG_CMD_FPGA is not set
 CONFIG_ETH_DESIGNWARE=y
 CONFIG_USB_EHCI_HCD=y
+CONFIG_SPL_STACK_R_ADDR=0x4fe00000
configs/Mele_M9_defconfig +1 -0
index b52e3c2..716a9e4 100644
@@ -17,3 +17,4 @@ CONFIG_AXP221_DLDO1_VOLT=3300
 CONFIG_AXP221_DLDO4_VOLT=3300
 CONFIG_AXP221_ALDO1_VOLT=3300
 CONFIG_USB_EHCI_HCD=y
+CONFIG_SPL_STACK_R_ADDR=0x4fe00000
configs/Merrii_A80_Optimus_defconfig +1 -0
index 53e023a..acfbd21 100644
@@ -11,3 +11,4 @@ CONFIG_DEFAULT_DEVICE_TREE="sun9i-a80-optimus"
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_FPGA is not set
+CONFIG_SPL_STACK_R_ADDR=0x2fe00000
configs/Mini-X_defconfig +1 -0
index 31d6217..755b2ec 100644
@@ -12,3 +12,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER"
 # CONFIG_CMD_FPGA is not set
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_MUSB_HOST=y
+CONFIG_SPL_STACK_R_ADDR=0x4fe00000
configs/Orangepi_defconfig +1 -0
index d67bb90..4966aff 100644
@@ -16,3 +16,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_GMAC,RGMII,MACPWR=SUNXI_GPH(23),AHC
 # CONFIG_CMD_FPGA is not set
 CONFIG_ETH_DESIGNWARE=y
 CONFIG_USB_EHCI_HCD=y
+CONFIG_SPL_STACK_R_ADDR=0x4fe00000
configs/Orangepi_mini_defconfig +1 -0
index 71d236b..af45541 100644
@@ -18,3 +18,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_GMAC,RGMII,MACPWR=SUNXI_GPH(23),AHC
 # CONFIG_CMD_FPGA is not set
 CONFIG_ETH_DESIGNWARE=y
 CONFIG_USB_EHCI_HCD=y
+CONFIG_SPL_STACK_R_ADDR=0x4fe00000
configs/Sinlinx_SinA33_defconfig +1 -0
index 720f3dc..2167665 100644
@@ -10,3 +10,4 @@ CONFIG_SPL=y
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_FPGA is not set
 CONFIG_AXP221_ALDO1_VOLT=3000
+CONFIG_SPL_STACK_R_ADDR=0x4fe00000
configs/TZX-Q8-713B7_defconfig +1 -0
index f5e3574..a9e6257 100644
@@ -19,3 +19,4 @@ CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=2,AXP209_POWER"
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_FPGA is not set
 CONFIG_USB_MUSB_HOST=y
+CONFIG_SPL_STACK_R_ADDR=0x4fe00000
configs/UTOO_P66_defconfig +1 -0
index 5417814..8cad8bb 100644
@@ -26,3 +26,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER"
 # CONFIG_CMD_FPGA is not set
 # CONFIG_REQUIRE_SERIAL_CONSOLE is not set
 CONFIG_USB_MUSB_HOST=y
+CONFIG_SPL_STACK_R_ADDR=0x4fe00000
configs/Wexler_TAB7200_defconfig +1 -0
index 02504f9..2db35bb 100644
@@ -19,3 +19,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER"
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_FPGA is not set
 CONFIG_USB_EHCI_HCD=y
+CONFIG_SPL_STACK_R_ADDR=0x4fe00000
configs/Wits_Pro_A20_DKT_defconfig +1 -0
index 66b51bc..81bbfda 100644
@@ -17,3 +17,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_GMAC,RGMII,AHCI"
 # CONFIG_CMD_FPGA is not set
 CONFIG_ETH_DESIGNWARE=y
 CONFIG_USB_EHCI_HCD=y
+CONFIG_SPL_STACK_R_ADDR=0x4fe00000
configs/Wobo_i5_defconfig +1 -0
index 206fd48..7e988a5 100644
@@ -12,3 +12,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER"
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_FPGA is not set
 CONFIG_USB_EHCI_HCD=y
+CONFIG_SPL_STACK_R_ADDR=0x4fe00000
configs/Yones_Toptech_BD1078_defconfig +1 -0
index e26816c..ae50556 100644
@@ -24,3 +24,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER"
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_FPGA is not set
 CONFIG_USB_MUSB_HOST=y
+CONFIG_SPL_STACK_R_ADDR=0x4fe00000
configs/ba10_tv_box_defconfig +1 -0
index 104d53d..d85b891 100644
@@ -15,3 +15,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_EMAC"
 # CONFIG_CMD_FPGA is not set
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_MUSB_HOST=y
+CONFIG_SPL_STACK_R_ADDR=0x4fe00000
configs/forfun_q88db_defconfig +1 -0
index 30e0937..de5037e 100644
@@ -18,3 +18,4 @@ CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=2,AXP209_POWER"
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_FPGA is not set
 CONFIG_USB_MUSB_HOST=y
+CONFIG_SPL_STACK_R_ADDR=0x4fe00000
configs/ga10h_v1_1_defconfig +1 -0
index 417a89c..aa1e747 100644
@@ -25,3 +25,4 @@ CONFIG_AXP221_DLDO1_VOLT=3300
 CONFIG_AXP221_ALDO1_VOLT=3000
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_MUSB_HOST=y
+CONFIG_SPL_STACK_R_ADDR=0x4fe00000
configs/gt90h_v4_defconfig +1 -0
index 3b72dc2..e6bd733 100644
@@ -24,3 +24,4 @@ CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=5"
 CONFIG_AXP221_DCDC2_VOLT=1100
 CONFIG_AXP221_DLDO1_VOLT=3300
 CONFIG_AXP221_ALDO1_VOLT=3000
+CONFIG_SPL_STACK_R_ADDR=0x4fe00000
configs/i12-tvbox_defconfig +1 -0
index d4d9524..3646bd6 100644
@@ -12,3 +12,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_GMAC,MACPWR=SUNXI_GPH(21)"
 # CONFIG_CMD_FPGA is not set
 CONFIG_ETH_DESIGNWARE=y
 CONFIG_USB_EHCI_HCD=y
+CONFIG_SPL_STACK_R_ADDR=0x4fe00000
configs/iNet_3F_defconfig +1 -0
index 211cb86..f792eb3 100644
@@ -19,3 +19,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER"
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_FPGA is not set
 CONFIG_USB_MUSB_HOST=y
+CONFIG_SPL_STACK_R_ADDR=0x4fe00000
configs/iNet_3W_defconfig +1 -0
index 35f08e5..2447fdb 100644
@@ -19,3 +19,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER"
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_FPGA is not set
 CONFIG_USB_MUSB_HOST=y
+CONFIG_SPL_STACK_R_ADDR=0x4fe00000
configs/iNet_86VS_defconfig +1 -0
index bb8d080..c34b1cd 100644
@@ -18,3 +18,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER"
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_FPGA is not set
 CONFIG_USB_MUSB_HOST=y
+CONFIG_SPL_STACK_R_ADDR=0x4fe00000
configs/inet1_defconfig +1 -0
index b2ba497..399a976 100644
@@ -20,3 +20,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER"
 # CONFIG_CMD_FPGA is not set
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_MUSB_HOST=y
+CONFIG_SPL_STACK_R_ADDR=0x4fe00000
configs/inet97fv2_defconfig +1 -0
index d7ddee1..5aeddbe 100644
@@ -18,3 +18,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER"
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_FPGA is not set
+CONFIG_SPL_STACK_R_ADDR=0x4fe00000
configs/inet98v_rev2_defconfig +1 -0
index c23245a..6b2284c 100644
@@ -20,3 +20,4 @@ CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=2,AXP209_POWER"
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_FPGA is not set
+CONFIG_SPL_STACK_R_ADDR=0x4fe00000
configs/inet9f_rev03_defconfig +1 -0
index fdfb02a..fe2b350 100644
@@ -18,3 +18,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER"
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_FPGA is not set
+CONFIG_SPL_STACK_R_ADDR=0x4fe00000
configs/jesurun_q5_defconfig +1 -0
index 46c38e5..889696a 100644
@@ -13,3 +13,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_EMAC,MACPWR=SUNXI_GPH(19)"
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_MUSB_HOST=y
 CONFIG_USB0_VBUS_PIN="PB9"
+CONFIG_SPL_STACK_R_ADDR=0x4fe00000
configs/mixtile_loftq_defconfig +1 -0
index 26fc4ce..cc8a024 100644
@@ -15,3 +15,4 @@ CONFIG_SYS_EXTRA_OPTIONS="SUNXI_GMAC,RGMII,MACPWR=SUNXI_GPA(21)"
 CONFIG_ETH_DESIGNWARE=y
 CONFIG_AXP221_ALDO1_VOLT=3300
 CONFIG_USB_EHCI_HCD=y
+CONFIG_SPL_STACK_R_ADDR=0x4fe00000
configs/mk802_a10s_defconfig +1 -0
index db437f0..b0584b5 100644
@@ -12,3 +12,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AXP152_POWER"
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_FPGA is not set
 CONFIG_USB_EHCI_HCD=y
+CONFIG_SPL_STACK_R_ADDR=0x4fe00000
configs/mk802_defconfig +1 -0
index 68b2c5e..c2136b7 100644
@@ -10,3 +10,4 @@ CONFIG_SYS_EXTRA_OPTIONS="USB_EHCI"
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_FPGA is not set
 CONFIG_USB_EHCI_HCD=y
+CONFIG_SPL_STACK_R_ADDR=0x4fe00000
configs/mk802ii_defconfig +1 -0
index d3cb664..5cf742c 100644
@@ -9,3 +9,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER"
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_FPGA is not set
 CONFIG_USB_EHCI_HCD=y
+CONFIG_SPL_STACK_R_ADDR=0x4fe00000
configs/pov_protab2_ips9_defconfig +1 -0
index 3107f31..b28eb4d 100644
@@ -19,3 +19,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER"
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_FPGA is not set
 CONFIG_USB_MUSB_HOST=y
+CONFIG_SPL_STACK_R_ADDR=0x4fe00000
configs/q8_a13_tablet_defconfig +1 -0
index 2c61f51..16b2d51 100644
@@ -20,3 +20,4 @@ CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=2,AXP209_POWER"
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_FPGA is not set
 CONFIG_USB_MUSB_HOST=y
+CONFIG_SPL_STACK_R_ADDR=0x4fe00000
configs/r7-tv-dongle_defconfig +1 -0
index 62c58fc..77c9170 100644
@@ -11,3 +11,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AXP152_POWER"
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_FPGA is not set
 CONFIG_USB_EHCI_HCD=y
+CONFIG_SPL_STACK_R_ADDR=0x4fe00000
configs/sunxi_Gemei_G9_defconfig +1 -0
index d0f987c..66c763e 100644
@@ -16,3 +16,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER"
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_FPGA is not set
 CONFIG_USB_EHCI_HCD=y
+CONFIG_SPL_STACK_R_ADDR=0x4fe00000
include/configs/sunxi-common.h +8 -0
index 648e4e8..8de97f6 100644
@@ -73,6 +73,10 @@
 #define CONFIG_SYS_LOAD_ADDR		0x22000000 /* default load address */
 #define CONFIG_SYS_TEXT_BASE		0x2a000000
 #define CONFIG_PRE_CON_BUF_ADDR		0x2f000000
+/* Note SPL_STACK_R_ADDR is set through Kconfig, we include it here 
+ * since it needs to fit in with the other values. By also #defining it
+ * we get warnings if the Kconfig value mismatches. */
+#define CONFIG_SPL_STACK_R_ADDR		0x2fe00000
 #define CONFIG_SYS_SPL_MALLOC_START	0x2ff00000
 #define CONFIG_SPL_BSS_START_ADDR	0x2ff80000
 #else
@@ -81,6 +85,10 @@
 #define CONFIG_SYS_LOAD_ADDR		0x42000000 /* default load address */
 #define CONFIG_SYS_TEXT_BASE		0x4a000000
 #define CONFIG_PRE_CON_BUF_ADDR		0x4f000000
+/* Note SPL_STACK_R_ADDR is set through Kconfig, we include it here 
+ * since it needs to fit in with the other values. By also #defining it
+ * we get warnings if the Kconfig value mismatches. */
+#define CONFIG_SPL_STACK_R_ADDR		0x4fe00000
 #define CONFIG_SYS_SPL_MALLOC_START	0x4ff00000
 #define CONFIG_SPL_BSS_START_ADDR	0x4ff80000
 #endif
Signature · 1 line
2.4.3
#1 lore raw

PATCH v2 2/2 sunxi: Switch to using malloc_simple for the spl

common/dlmalloc.c is quite big, both in .text and .data usage. E.g. for a Mele_M9 sun6i board build this reduces .text from 0x4214 to 0x3b94 bytes, and .data from 0x54c to 0x144 bytes.

---
Changes in v2:
-Call spl_init from board_init_f, so that it does not get called from
board_init_r. This is necessary as spl_init sets the initial SRAM sample-malloc buffer size in gd->malloc_limit, so we do not want it to run after we've switched to the new DRAM based malloc heap

---
 arch/arm/Kconfig                 | 1 +
 arch/arm/cpu/armv7/sunxi/board.c | 1 +
 include/configs/sunxi-common.h   | 3 ---
 3 files changed, 2 insertions(+), 3 deletions(-)
arch/arm/Kconfig +1 -0
index a862a7a..f53c41f 100644
@@ -518,6 +518,7 @@ config ARCH_SUNXI
 	select DM_USB
 	select OF_CONTROL
 	select OF_SEPARATE
+	select SPL_MALLOC_SIMPLE
 	select SPL_STACK_R
 	select USB
 	select USB_STORAGE
arch/arm/cpu/armv7/sunxi/board.c +1 -0
index 8883cf5..19d1e9b 100644
@@ -191,6 +191,7 @@ u32 spl_boot_mode(void)
 
 void board_init_f(ulong dummy)
 {
+	spl_init();
 	preloader_console_init();
 
 #ifdef CONFIG_SPL_I2C_SUPPORT
include/configs/sunxi-common.h +0 -3
index 8de97f6..79dfa82 100644
@@ -77,7 +77,6 @@
  * since it needs to fit in with the other values. By also #defining it
  * we get warnings if the Kconfig value mismatches. */
 #define CONFIG_SPL_STACK_R_ADDR		0x2fe00000
-#define CONFIG_SYS_SPL_MALLOC_START	0x2ff00000
 #define CONFIG_SPL_BSS_START_ADDR	0x2ff80000
 #else
 #define SDRAM_OFFSET(x) 0x4##x
@@ -89,12 +88,10 @@
  * since it needs to fit in with the other values. By also #defining it
  * we get warnings if the Kconfig value mismatches. */
 #define CONFIG_SPL_STACK_R_ADDR		0x4fe00000
-#define CONFIG_SYS_SPL_MALLOC_START	0x4ff00000
 #define CONFIG_SPL_BSS_START_ADDR	0x4ff80000
 #endif
 
 #define CONFIG_SPL_BSS_MAX_SIZE		0x00080000 /* 512 KiB */
-#define CONFIG_SYS_SPL_MALLOC_SIZE	0x00080000 /* 512 KiB */
 
 #ifdef CONFIG_MACH_SUN9I
 /*
Signature · 1 line
2.4.3
#2 lore raw

PATCH v2 2/2 sunxi: Switch to using malloc_simple for the spl

Quoted 5 lines · Hans de Goede

common/dlmalloc.c is quite big, both in .text and .data usage. E.g. for a Mele_M9 sun6i board build this reduces .text from 0x4214 to 0x3b94 bytes, and .data from 0x54c to 0x144 bytes.

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20150915/8fd8e258/attachment.sig>
#3 lore raw

PATCH v2 1/2 sunxi: Enable CONFIG_SPL_STACK_R

In reply to Hans de Goede
Quoted 8 lines · Hans de Goede

Select CONFIG_SPL_STACK_R for sunxi boards, this gives us much more room on the stack once we've the DRAM running.

Besides being a good change to have on itself, this also paves the way for switching to using malloc_simple in the SPL which cuts of close to 4KiB of the SPL size.

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20150915/6ab6771b/attachment.sig>