summaryrefslogtreecommitdiff
path: root/board
diff options
context:
space:
mode:
authorTom Rini <[email protected]>2026-05-01 08:12:31 -0600
committerTom Rini <[email protected]>2026-05-01 08:12:31 -0600
commitbb0f3eebb3c196d9b6efbbd1e5aa9b16abbb9ad6 (patch)
treed79d178cc3b66267ed0558f53bfc6ca200136826 /board
parent21d842d4e538f93fd9d0e3f8905b26b17256d409 (diff)
parent4c8d2a633ed22e90c6b1954b10b0f74fd678cb23 (diff)
Merge branch 'master' of https://source.denx.de/u-boot/custodians/u-boot-sunxiHEADmaster
Apologies for the delay, but please pull those sunxi changes into v2026.07. Nothing earth shattering, mostly minor improvements like better SPL power LED support, and fixes to some H616 DRAM setup. Also some more forward looking enhancement for the SPI code. I also pulled in Richard's raw NAND flash improvements for the H6/H616 SoC, though this lacks proper peer testing due to the lack of mainline support for any board actually employing those chips.
Diffstat (limited to 'board')
-rw-r--r--board/sunxi/board.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/board/sunxi/board.c b/board/sunxi/board.c
index d7722d1858a..3d1afec7c66 100644
--- a/board/sunxi/board.c
+++ b/board/sunxi/board.c
@@ -563,8 +563,8 @@ static void sunxi_spl_store_dram_size(phys_addr_t dram_size)
static void status_led_init(void)
{
#if CONFIG_IS_ENABLED(SUNXI_LED_STATUS)
- unsigned int state = CONFIG_SPL_SUNXI_LED_STATUS_STATE;
- unsigned int gpio = CONFIG_SPL_SUNXI_LED_STATUS_BIT;
+ unsigned int state = IS_ENABLED(CONFIG_SPL_SUNXI_LED_STATUS_ACTIVE_HIGH);
+ unsigned int gpio = CONFIG_SPL_SUNXI_LED_STATUS_GPIO;
gpio_request(gpio, "gpio_led");
gpio_direction_output(gpio, state);