summaryrefslogtreecommitdiff
path: root/board
diff options
context:
space:
mode:
authorTom Rini <[email protected]>2022-04-08 13:33:14 -0400
committerTom Rini <[email protected]>2022-04-08 13:33:14 -0400
commit909d2120e27964a9cfdc8d254cd8fa5a0e1345a7 (patch)
tree0e64d4838989cff35a0cc14dbfbcb6a5a37667c3 /board
parent03a8a797e5dccaffe172d3b5224bc3c3fcd304d6 (diff)
parent2fc0995cc05cc55bee79f387d1e83571539b0b3e (diff)
Merge branch '2022-04-08-Kconfig-updates-and-dead-code-removal'
- Migration of more symbols from board config.h files to defconfig - Remove unused network drivers
Diffstat (limited to 'board')
-rw-r--r--board/AndesTech/adp-ag101p/Kconfig4
-rw-r--r--board/armltd/integrator/integrator.c1
-rw-r--r--board/armltd/integrator/lowlevel_init.S7
-rw-r--r--board/atmel/at91sam9260ek/Makefile1
-rw-r--r--board/atmel/at91sam9260ek/led.c22
-rw-r--r--board/atmel/at91sam9261ek/Makefile1
-rw-r--r--board/atmel/at91sam9261ek/led.c28
-rw-r--r--board/atmel/at91sam9263ek/Makefile1
-rw-r--r--board/atmel/at91sam9263ek/led.c27
-rw-r--r--board/atmel/at91sam9m10g45ek/Makefile1
-rw-r--r--board/atmel/at91sam9m10g45ek/led.c24
-rw-r--r--board/atmel/at91sam9rlek/Makefile1
-rw-r--r--board/atmel/at91sam9rlek/led.c26
-rw-r--r--board/freescale/common/Kconfig8
-rw-r--r--board/freescale/ls1021atwr/ls1021atwr.c2
-rw-r--r--board/ronetix/pm9261/Makefile1
-rw-r--r--board/ronetix/pm9261/led.c26
-rw-r--r--board/ronetix/pm9263/Makefile1
-rw-r--r--board/ronetix/pm9263/led.c24
-rw-r--r--board/siemens/corvus/board.c24
-rw-r--r--board/st/stm32f429-discovery/led.c19
21 files changed, 48 insertions, 201 deletions
diff --git a/board/AndesTech/adp-ag101p/Kconfig b/board/AndesTech/adp-ag101p/Kconfig
index 5e8aa22c448..0fb7a10409b 100644
--- a/board/AndesTech/adp-ag101p/Kconfig
+++ b/board/AndesTech/adp-ag101p/Kconfig
@@ -1,5 +1,9 @@
if TARGET_ADP_AG101P
+config DEBUG_LED
+ hex
+ default 0x902FFFFC
+
config SYS_CPU
default "n1213"
diff --git a/board/armltd/integrator/integrator.c b/board/armltd/integrator/integrator.c
index 388795809df..e734ceae889 100644
--- a/board/armltd/integrator/integrator.c
+++ b/board/armltd/integrator/integrator.c
@@ -24,6 +24,7 @@
#include <init.h>
#include <net.h>
#include <netdev.h>
+#include <armcoremodule.h>
#include <asm/global_data.h>
#include <asm/io.h>
#include <dm/platform_data/serial_pl01x.h>
diff --git a/board/armltd/integrator/lowlevel_init.S b/board/armltd/integrator/lowlevel_init.S
index 1a1cb580be6..ea5b654ed52 100644
--- a/board/armltd/integrator/lowlevel_init.S
+++ b/board/armltd/integrator/lowlevel_init.S
@@ -7,6 +7,7 @@
*/
#include <config.h>
+#include <armcoremodule.h>
/* Reset using CM control register */
.global reset_cpu
@@ -41,10 +42,6 @@ lowlevel_init:
/* set the desired CM specific value */
mov r2,#CMMASK_LOWVEC /* Vectors at 0x00000000 for all */
-#if defined (CONFIG_CM10200E) || defined (CONFIG_CM10220E)
- orr r2,r2,#CMMASK_INIT_102
-#else
-
#if !defined (CONFIG_CM920T) && !defined (CONFIG_CM920T_ETM) && \
!defined (CONFIG_CM940T)
@@ -69,8 +66,6 @@ lowlevel_init:
#endif /* CMxx6 code */
-#endif /* ARM102xxE value */
-
/* read CM_INIT */
mov r0, #CM_BASE
ldr r1, [r0, #OS_INIT]
diff --git a/board/atmel/at91sam9260ek/Makefile b/board/atmel/at91sam9260ek/Makefile
index 56cac975085..0f1729644cd 100644
--- a/board/atmel/at91sam9260ek/Makefile
+++ b/board/atmel/at91sam9260ek/Makefile
@@ -8,4 +8,3 @@
# Lead Tech Design <www.leadtechdesign.com>
obj-y += at91sam9260ek.o
-obj-$(CONFIG_AT91_LED) += led.o
diff --git a/board/atmel/at91sam9260ek/led.c b/board/atmel/at91sam9260ek/led.c
deleted file mode 100644
index cc6d5d7a05e..00000000000
--- a/board/atmel/at91sam9260ek/led.c
+++ /dev/null
@@ -1,22 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-/*
- * (C) Copyright 2007-2008
- * Stelian Pop <[email protected]>
- * Lead Tech Design <www.leadtechdesign.com>
- */
-
-#include <common.h>
-#include <init.h>
-#include <asm/io.h>
-#include <asm/arch/gpio.h>
-#include <status_led.h>
-
-void coloured_LED_init(void)
-{
- /* Clock is enabled in board_early_init_f() */
- at91_set_gpio_output(CONFIG_RED_LED, 1);
- at91_set_gpio_output(CONFIG_GREEN_LED, 1);
-
- at91_set_gpio_value(CONFIG_RED_LED, 0);
- at91_set_gpio_value(CONFIG_GREEN_LED, 1);
-}
diff --git a/board/atmel/at91sam9261ek/Makefile b/board/atmel/at91sam9261ek/Makefile
index 7f5369f4319..de3466627b1 100644
--- a/board/atmel/at91sam9261ek/Makefile
+++ b/board/atmel/at91sam9261ek/Makefile
@@ -8,4 +8,3 @@
# Lead Tech Design <www.leadtechdesign.com>
obj-y += at91sam9261ek.o
-obj-$(CONFIG_AT91_LED) += led.o
diff --git a/board/atmel/at91sam9261ek/led.c b/board/atmel/at91sam9261ek/led.c
deleted file mode 100644
index a1aab98d587..00000000000
--- a/board/atmel/at91sam9261ek/led.c
+++ /dev/null
@@ -1,28 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-/*
- * (C) Copyright 2007-2008
- * Stelian Pop <[email protected]>
- * Lead Tech Design <www.leadtechdesign.com>
- */
-
-#include <common.h>
-#include <status_led.h>
-#include <asm/arch/at91sam9261.h>
-#include <asm/arch/gpio.h>
-#include <asm/arch/at91_pio.h>
-#include <asm/arch/clk.h>
-#include <asm/io.h>
-
-void coloured_LED_init(void)
-{
- /* Enable clock */
- at91_periph_clk_enable(ATMEL_ID_PIOA);
-
- at91_set_gpio_output(CONFIG_RED_LED, 1);
- at91_set_gpio_output(CONFIG_GREEN_LED, 1);
- at91_set_gpio_output(CONFIG_YELLOW_LED, 1);
-
- at91_set_gpio_value(CONFIG_RED_LED, 0);
- at91_set_gpio_value(CONFIG_GREEN_LED, 1);
- at91_set_gpio_value(CONFIG_YELLOW_LED, 1);
-}
diff --git a/board/atmel/at91sam9263ek/Makefile b/board/atmel/at91sam9263ek/Makefile
index 44c8d95a085..57ad36f7582 100644
--- a/board/atmel/at91sam9263ek/Makefile
+++ b/board/atmel/at91sam9263ek/Makefile
@@ -8,4 +8,3 @@
# Lead Tech Design <www.leadtechdesign.com>
obj-y += at91sam9263ek.o
-obj-$(CONFIG_AT91_LED) += led.o
diff --git a/board/atmel/at91sam9263ek/led.c b/board/atmel/at91sam9263ek/led.c
deleted file mode 100644
index 849501ec36b..00000000000
--- a/board/atmel/at91sam9263ek/led.c
+++ /dev/null
@@ -1,27 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-/*
- * (C) Copyright 2007-2008
- * Stelian Pop <[email protected]>
- * Lead Tech Design <www.leadtechdesign.com>
- */
-
-#include <common.h>
-#include <status_led.h>
-#include <asm/io.h>
-#include <asm/arch/gpio.h>
-#include <asm/arch/at91sam9263.h>
-#include <asm/arch/clk.h>
-
-void coloured_LED_init(void)
-{
- at91_periph_clk_enable(ATMEL_ID_PIOB);
- at91_periph_clk_enable(ATMEL_ID_PIOB);
-
- at91_set_gpio_output(CONFIG_RED_LED, 1);
- at91_set_gpio_output(CONFIG_GREEN_LED, 1);
- at91_set_gpio_output(CONFIG_YELLOW_LED, 1);
-
- at91_set_gpio_value(CONFIG_RED_LED, 0);
- at91_set_gpio_value(CONFIG_GREEN_LED, 1);
- at91_set_gpio_value(CONFIG_YELLOW_LED, 1);
-}
diff --git a/board/atmel/at91sam9m10g45ek/Makefile b/board/atmel/at91sam9m10g45ek/Makefile
index b05b81bac6d..c17719eba5a 100644
--- a/board/atmel/at91sam9m10g45ek/Makefile
+++ b/board/atmel/at91sam9m10g45ek/Makefile
@@ -8,4 +8,3 @@
# Lead Tech Design <www.leadtechdesign.com>
obj-y += at91sam9m10g45ek.o
-obj-(CONFIG_AT91_LED) += led.o
diff --git a/board/atmel/at91sam9m10g45ek/led.c b/board/atmel/at91sam9m10g45ek/led.c
deleted file mode 100644
index f44a09623fa..00000000000
--- a/board/atmel/at91sam9m10g45ek/led.c
+++ /dev/null
@@ -1,24 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-/*
- * (C) Copyright 2007-2008
- * Stelian Pop <[email protected]>
- * Lead Tech Design <www.leadtechdesign.com>
- */
-
-#include <common.h>
-#include <status_led.h>
-#include <asm/io.h>
-#include <asm/arch/at91sam9g45.h>
-#include <asm/arch/clk.h>
-#include <asm/arch/gpio.h>
-
-void coloured_LED_init(void)
-{
- at91_periph_clk_enable(ATMEL_ID_PIODE);
-
- at91_set_gpio_output(CONFIG_RED_LED, 1);
- at91_set_gpio_output(CONFIG_GREEN_LED, 1);
-
- at91_set_gpio_value(CONFIG_RED_LED, 0);
- at91_set_gpio_value(CONFIG_GREEN_LED, 1);
-}
diff --git a/board/atmel/at91sam9rlek/Makefile b/board/atmel/at91sam9rlek/Makefile
index 30dcb491308..96e246dc017 100644
--- a/board/atmel/at91sam9rlek/Makefile
+++ b/board/atmel/at91sam9rlek/Makefile
@@ -8,4 +8,3 @@
# Lead Tech Design <www.leadtechdesign.com>
obj-y += at91sam9rlek.o
-obj-$(CONFIG_AT91_LED) += led.o
diff --git a/board/atmel/at91sam9rlek/led.c b/board/atmel/at91sam9rlek/led.c
deleted file mode 100644
index 6dd19aea150..00000000000
--- a/board/atmel/at91sam9rlek/led.c
+++ /dev/null
@@ -1,26 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-/*
- * (C) Copyright 2007-2008
- * Stelian Pop <[email protected]>
- * Lead Tech Design <www.leadtechdesign.com>
- */
-
-#include <common.h>
-#include <status_led.h>
-#include <asm/arch/at91sam9rl.h>
-#include <asm/arch/clk.h>
-#include <asm/arch/gpio.h>
-#include <asm/io.h>
-
-void coloured_LED_init(void)
-{
- at91_periph_clk_enable(ATMEL_ID_PIOD);
-
- at91_set_gpio_output(CONFIG_RED_LED, 1);
- at91_set_gpio_output(CONFIG_GREEN_LED, 1);
- at91_set_gpio_output(CONFIG_YELLOW_LED, 1);
-
- at91_set_gpio_value(CONFIG_RED_LED, 0);
- at91_set_gpio_value(CONFIG_GREEN_LED, 1);
- at91_set_gpio_value(CONFIG_YELLOW_LED, 1);
-}
diff --git a/board/freescale/common/Kconfig b/board/freescale/common/Kconfig
index b41d93b6f68..6553bf63bfd 100644
--- a/board/freescale/common/Kconfig
+++ b/board/freescale/common/Kconfig
@@ -99,3 +99,11 @@ config VOL_MONITOR_ISL68233_SET
functionality. It is used by the common VID driver.
endif
+
+config FSL_QIXIS
+ bool "Enable QIXIS support"
+
+config QIXIS_I2C_ACCESS
+ bool "Access to QIXIS is over i2c"
+ depends on FSL_QIXIS
+ default y
diff --git a/board/freescale/ls1021atwr/ls1021atwr.c b/board/freescale/ls1021atwr/ls1021atwr.c
index f0b441db638..4a244956739 100644
--- a/board/freescale/ls1021atwr/ls1021atwr.c
+++ b/board/freescale/ls1021atwr/ls1021atwr.c
@@ -107,7 +107,7 @@ static void cpld_show(void)
in_8(&cpld_data->pcba_ver) & VERSION_MASK,
in_8(&cpld_data->vbank) & BANK_MASK);
-#ifdef CONFIG_DEBUG
+#ifdef DEBUG
printf("soft_mux_on =%x\n",
in_8(&cpld_data->soft_mux_on));
printf("cfg_rcw_src1 =%x\n",
diff --git a/board/ronetix/pm9261/Makefile b/board/ronetix/pm9261/Makefile
index 9fa3dfb66a0..70e197166bb 100644
--- a/board/ronetix/pm9261/Makefile
+++ b/board/ronetix/pm9261/Makefile
@@ -9,4 +9,3 @@
# Ilko Iliev <www.ronetix.at>
obj-y += pm9261.o
-obj-$(CONFIG_RED_LED) += led.o
diff --git a/board/ronetix/pm9261/led.c b/board/ronetix/pm9261/led.c
deleted file mode 100644
index df955830b1b..00000000000
--- a/board/ronetix/pm9261/led.c
+++ /dev/null
@@ -1,26 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-/*
- * (C) Copyright 2007-2008
- * Stelian Pop <[email protected]>
- * Lead Tech Design <www.leadtechdesign.com>
- * Ilko Iliev <www.ronetix.at>
- */
-
-#include <common.h>
-#include <status_led.h>
-#include <asm/gpio.h>
-#include <asm/arch/clk.h>
-#include <asm/arch/gpio.h>
-
-void coloured_LED_init(void)
-{
- at91_periph_clk_enable(ATMEL_ID_PIOC);
-
- gpio_direction_output(CONFIG_RED_LED, 1);
- gpio_direction_output(CONFIG_GREEN_LED, 1);
- gpio_direction_output(CONFIG_YELLOW_LED, 1);
-
- gpio_set_value(CONFIG_RED_LED, 0);
- gpio_set_value(CONFIG_GREEN_LED, 1);
- gpio_set_value(CONFIG_YELLOW_LED, 1);
-}
diff --git a/board/ronetix/pm9263/Makefile b/board/ronetix/pm9263/Makefile
index e81c57e2145..5ad595d57b6 100644
--- a/board/ronetix/pm9263/Makefile
+++ b/board/ronetix/pm9263/Makefile
@@ -9,4 +9,3 @@
# Ilko Iliev <www.ronetix.at>
obj-y += pm9263.o
-obj-$(CONFIG_AT91_LED) += led.o
diff --git a/board/ronetix/pm9263/led.c b/board/ronetix/pm9263/led.c
deleted file mode 100644
index 524b4afcbd2..00000000000
--- a/board/ronetix/pm9263/led.c
+++ /dev/null
@@ -1,24 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-/*
- * (C) Copyright 2007-2008
- * Stelian Pop <[email protected]>
- * Lead Tech Design <www.leadtechdesign.com>
- * Ilko Iliev <www.ronetix.at>
- */
-
-#include <common.h>
-#include <status_led.h>
-#include <asm/gpio.h>
-#include <asm/arch/clk.h>
-#include <asm/arch/gpio.h>
-
-void coloured_LED_init(void)
-{
- at91_periph_clk_enable(ATMEL_ID_PIOB);
-
- gpio_direction_output(CONFIG_RED_LED, 1);
- gpio_direction_output(CONFIG_GREEN_LED, 1);
-
- gpio_set_value(CONFIG_RED_LED, 0);
- gpio_set_value(CONFIG_GREEN_LED, 1);
-}
diff --git a/board/siemens/corvus/board.c b/board/siemens/corvus/board.c
index a6e1737be02..90fece7f958 100644
--- a/board/siemens/corvus/board.c
+++ b/board/siemens/corvus/board.c
@@ -52,8 +52,28 @@ static void corvus_request_gpio(void)
gpio_request(AT91_PIN_PD3, "USB1");
gpio_request(AT91_PIN_PB18, "SPICS1");
gpio_request(AT91_PIN_PB3, "SPICS0");
- gpio_request(CONFIG_RED_LED, "red led");
- gpio_request(CONFIG_GREEN_LED, "green led");
+ gpio_request(AT91_PIN_PD31, "red led"); /* this is the user1 led */
+ gpio_request(AT91_PIN_PD0, "green led"); /* this is the user2 led */
+}
+
+void red_led_on(void)
+{
+ gpio_set_value(AT91_PIN_PD31, 1);
+}
+
+void red_led_off(void)
+{
+ gpio_set_value(AT91_PIN_PD31, 0);
+}
+
+void green_led_on(void)
+{
+ gpio_set_value(AT91_PIN_PD0, 0);
+}
+
+void green_led_off(void)
+{
+ gpio_set_value(AT91_PIN_PD0, 1);
}
static void corvus_nand_hw_init(void)
diff --git a/board/st/stm32f429-discovery/led.c b/board/st/stm32f429-discovery/led.c
index 539c139bb5d..8dda6a97bd1 100644
--- a/board/st/stm32f429-discovery/led.c
+++ b/board/st/stm32f429-discovery/led.c
@@ -8,30 +8,33 @@
#include <status_led.h>
#include <asm-generic/gpio.h>
+#define RED_LED 110
+#define GREEN_LED 109
+
void coloured_LED_init(void)
{
- gpio_request(CONFIG_RED_LED, "red led");
- gpio_direction_output(CONFIG_RED_LED, 0);
- gpio_request(CONFIG_GREEN_LED, "green led");
- gpio_direction_output(CONFIG_GREEN_LED, 0);
+ gpio_request(RED_LED, "red led");
+ gpio_direction_output(RED_LED, 0);
+ gpio_request(GREEN_LED, "green led");
+ gpio_direction_output(GREEN_LED, 0);
}
void red_led_off(void)
{
- gpio_set_value(CONFIG_RED_LED, 0);
+ gpio_set_value(RED_LED, 0);
}
void green_led_off(void)
{
- gpio_set_value(CONFIG_GREEN_LED, 0);
+ gpio_set_value(GREEN_LED, 0);
}
void red_led_on(void)
{
- gpio_set_value(CONFIG_RED_LED, 1);
+ gpio_set_value(RED_LED, 1);
}
void green_led_on(void)
{
- gpio_set_value(CONFIG_GREEN_LED, 1);
+ gpio_set_value(GREEN_LED, 1);
}