diff options
| author | Tom Rini <trini@konsulko.com> | 2023-01-10 11:19:45 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2023-01-20 12:27:24 -0500 |
| commit | 6e7df1d151a7a127caf3b62ff6dfc003fc2aefcd (patch) | |
| tree | ae38e9dcf468b2e4e58293561fae87895d9b549f /drivers/gpio/mpc83xx_gpio.c | |
| parent | ad242344681f6a0076a6bf100aa83ac9ecbea355 (diff) | |
| download | u-boot-6e7df1d151a7a127caf3b62ff6dfc003fc2aefcd.zip u-boot-6e7df1d151a7a127caf3b62ff6dfc003fc2aefcd.tar.gz u-boot-6e7df1d151a7a127caf3b62ff6dfc003fc2aefcd.tar.bz2 | |
global: Finish CONFIG -> CFG migration
At this point, the remaining places where we have a symbol that is
defined as CONFIG_... are in fairly odd locations. While as much dead
code has been removed as possible, some of these locations are simply
less obvious at first. In other cases, this code is used, but was
defined in such a way as to have been missed by earlier checks. Perform
a rename of all such remaining symbols to be CFG_... rather than
CONFIG_...
Signed-off-by: Tom Rini <trini@konsulko.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'drivers/gpio/mpc83xx_gpio.c')
| -rw-r--r-- | drivers/gpio/mpc83xx_gpio.c | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/drivers/gpio/mpc83xx_gpio.c b/drivers/gpio/mpc83xx_gpio.c index 276a3b3..bf693c8 100644 --- a/drivers/gpio/mpc83xx_gpio.c +++ b/drivers/gpio/mpc83xx_gpio.c @@ -9,23 +9,23 @@ #include <asm/gpio.h> #include <asm/io.h> -#ifndef CONFIG_MPC83XX_GPIO_0_INIT_DIRECTION -#define CONFIG_MPC83XX_GPIO_0_INIT_DIRECTION 0 +#ifndef CFG_MPC83XX_GPIO_0_INIT_DIRECTION +#define CFG_MPC83XX_GPIO_0_INIT_DIRECTION 0 #endif -#ifndef CONFIG_MPC83XX_GPIO_1_INIT_DIRECTION -#define CONFIG_MPC83XX_GPIO_1_INIT_DIRECTION 0 +#ifndef CFG_MPC83XX_GPIO_1_INIT_DIRECTION +#define CFG_MPC83XX_GPIO_1_INIT_DIRECTION 0 #endif -#ifndef CONFIG_MPC83XX_GPIO_0_INIT_OPEN_DRAIN -#define CONFIG_MPC83XX_GPIO_0_INIT_OPEN_DRAIN 0 +#ifndef CFG_MPC83XX_GPIO_0_INIT_OPEN_DRAIN +#define CFG_MPC83XX_GPIO_0_INIT_OPEN_DRAIN 0 #endif -#ifndef CONFIG_MPC83XX_GPIO_1_INIT_OPEN_DRAIN -#define CONFIG_MPC83XX_GPIO_1_INIT_OPEN_DRAIN 0 +#ifndef CFG_MPC83XX_GPIO_1_INIT_OPEN_DRAIN +#define CFG_MPC83XX_GPIO_1_INIT_OPEN_DRAIN 0 #endif -#ifndef CONFIG_MPC83XX_GPIO_0_INIT_VALUE -#define CONFIG_MPC83XX_GPIO_0_INIT_VALUE 0 +#ifndef CFG_MPC83XX_GPIO_0_INIT_VALUE +#define CFG_MPC83XX_GPIO_0_INIT_VALUE 0 #endif -#ifndef CONFIG_MPC83XX_GPIO_1_INIT_VALUE -#define CONFIG_MPC83XX_GPIO_1_INIT_VALUE 0 +#ifndef CFG_MPC83XX_GPIO_1_INIT_VALUE +#define CFG_MPC83XX_GPIO_1_INIT_VALUE 0 #endif static unsigned int gpio_output_value[MPC83XX_GPIO_CTRLRS]; @@ -152,18 +152,18 @@ void mpc83xx_gpio_init_f(void) immap_t *im = (immap_t *)CONFIG_SYS_IMMR; #if MPC83XX_GPIO_CTRLRS >= 1 - out_be32(&im->gpio[0].dir, CONFIG_MPC83XX_GPIO_0_INIT_DIRECTION); - out_be32(&im->gpio[0].odr, CONFIG_MPC83XX_GPIO_0_INIT_OPEN_DRAIN); - out_be32(&im->gpio[0].dat, CONFIG_MPC83XX_GPIO_0_INIT_VALUE); + out_be32(&im->gpio[0].dir, CFG_MPC83XX_GPIO_0_INIT_DIRECTION); + out_be32(&im->gpio[0].odr, CFG_MPC83XX_GPIO_0_INIT_OPEN_DRAIN); + out_be32(&im->gpio[0].dat, CFG_MPC83XX_GPIO_0_INIT_VALUE); out_be32(&im->gpio[0].ier, 0xFFFFFFFF); /* Clear all events */ out_be32(&im->gpio[0].imr, 0); out_be32(&im->gpio[0].icr, 0); #endif #if MPC83XX_GPIO_CTRLRS >= 2 - out_be32(&im->gpio[1].dir, CONFIG_MPC83XX_GPIO_1_INIT_DIRECTION); - out_be32(&im->gpio[1].odr, CONFIG_MPC83XX_GPIO_1_INIT_OPEN_DRAIN); - out_be32(&im->gpio[1].dat, CONFIG_MPC83XX_GPIO_1_INIT_VALUE); + out_be32(&im->gpio[1].dir, CFG_MPC83XX_GPIO_1_INIT_DIRECTION); + out_be32(&im->gpio[1].odr, CFG_MPC83XX_GPIO_1_INIT_OPEN_DRAIN); + out_be32(&im->gpio[1].dat, CFG_MPC83XX_GPIO_1_INIT_VALUE); out_be32(&im->gpio[1].ier, 0xFFFFFFFF); /* Clear all events */ out_be32(&im->gpio[1].imr, 0); out_be32(&im->gpio[1].icr, 0); @@ -174,10 +174,10 @@ void mpc83xx_gpio_init_f(void) void mpc83xx_gpio_init_r(void) { #if MPC83XX_GPIO_CTRLRS >= 1 - gpio_output_value[0] = CONFIG_MPC83XX_GPIO_0_INIT_VALUE; + gpio_output_value[0] = CFG_MPC83XX_GPIO_0_INIT_VALUE; #endif #if MPC83XX_GPIO_CTRLRS >= 2 - gpio_output_value[1] = CONFIG_MPC83XX_GPIO_1_INIT_VALUE; + gpio_output_value[1] = CFG_MPC83XX_GPIO_1_INIT_VALUE; #endif } |