mirror of
https://github.com/brain-hackers/u-boot-brain
synced 2024-09-22 04:30:31 +09:00
sunxi: Convert CONFIG_SATAPWR to Kconfig
Convert the CONFIG_SATAPWR into kconfig. Thanks to that, many SYS_EXTRA_OPTIONS can be removed from some defconfigs. Signed-off-by: Mylène Josserand <mylene.josserand@free-electrons.com> Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
This commit is contained in:
parent
751b0be0a1
commit
d7b560e665
@ -706,6 +706,13 @@ config VIDEO_LCD_TL059WV5C0
|
|||||||
|
|
||||||
endchoice
|
endchoice
|
||||||
|
|
||||||
|
config SATAPWR
|
||||||
|
string "SATA power pin"
|
||||||
|
default ""
|
||||||
|
help
|
||||||
|
Set the pins used to power the SATA. This takes a string in the
|
||||||
|
format understood by sunxi_name_to_gpio, e.g. PH1 for pin 1 of
|
||||||
|
port H.
|
||||||
|
|
||||||
config GMAC_TX_DELAY
|
config GMAC_TX_DELAY
|
||||||
int "GMAC Transmit Clock Delay Chain"
|
int "GMAC Transmit Clock Delay Chain"
|
||||||
|
@ -80,7 +80,7 @@ DECLARE_GLOBAL_DATA_PTR;
|
|||||||
/* add board specific code here */
|
/* add board specific code here */
|
||||||
int board_init(void)
|
int board_init(void)
|
||||||
{
|
{
|
||||||
__maybe_unused int id_pfr1, ret;
|
__maybe_unused int id_pfr1, ret, satapwr_pin;
|
||||||
|
|
||||||
gd->bd->bi_boot_params = (PHYS_SDRAM_0 + 0x100);
|
gd->bd->bi_boot_params = (PHYS_SDRAM_0 + 0x100);
|
||||||
|
|
||||||
@ -118,8 +118,9 @@ int board_init(void)
|
|||||||
return ret;
|
return ret;
|
||||||
|
|
||||||
#ifdef CONFIG_SATAPWR
|
#ifdef CONFIG_SATAPWR
|
||||||
gpio_request(CONFIG_SATAPWR, "satapwr");
|
satapwr_pin = sunxi_name_to_gpio(CONFIG_SATAPWR);
|
||||||
gpio_direction_output(CONFIG_SATAPWR, 1);
|
gpio_request(satapwr_pin, "satapwr");
|
||||||
|
gpio_direction_output(satapwr_pin, 1);
|
||||||
#endif
|
#endif
|
||||||
#ifdef CONFIG_MACPWR
|
#ifdef CONFIG_MACPWR
|
||||||
gpio_request(CONFIG_MACPWR, "macpwr");
|
gpio_request(CONFIG_MACPWR, "macpwr");
|
||||||
|
@ -5,10 +5,10 @@ CONFIG_DRAM_CLK=480
|
|||||||
CONFIG_DRAM_EMR1=4
|
CONFIG_DRAM_EMR1=4
|
||||||
CONFIG_SYS_CLK_FREQ=912000000
|
CONFIG_SYS_CLK_FREQ=912000000
|
||||||
CONFIG_MMC0_CD_PIN="PH1"
|
CONFIG_MMC0_CD_PIN="PH1"
|
||||||
|
CONFIG_SATAPWR="PC3"
|
||||||
CONFIG_DEFAULT_DEVICE_TREE="sun4i-a10-olinuxino-lime"
|
CONFIG_DEFAULT_DEVICE_TREE="sun4i-a10-olinuxino-lime"
|
||||||
CONFIG_AHCI=y
|
CONFIG_AHCI=y
|
||||||
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
|
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
|
||||||
CONFIG_SYS_EXTRA_OPTIONS="SATAPWR=SUNXI_GPC(3)"
|
|
||||||
CONFIG_SPL=y
|
CONFIG_SPL=y
|
||||||
CONFIG_SPL_I2C_SUPPORT=y
|
CONFIG_SPL_I2C_SUPPORT=y
|
||||||
# CONFIG_CMD_IMLS is not set
|
# CONFIG_CMD_IMLS is not set
|
||||||
|
@ -5,10 +5,10 @@ CONFIG_DRAM_CLK=384
|
|||||||
CONFIG_MMC0_CD_PIN="PH1"
|
CONFIG_MMC0_CD_PIN="PH1"
|
||||||
CONFIG_USB0_VBUS_PIN="PC17"
|
CONFIG_USB0_VBUS_PIN="PC17"
|
||||||
CONFIG_USB0_VBUS_DET="PH5"
|
CONFIG_USB0_VBUS_DET="PH5"
|
||||||
|
CONFIG_SATAPWR="PC3"
|
||||||
CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-olinuxino-lime2"
|
CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-olinuxino-lime2"
|
||||||
CONFIG_AHCI=y
|
CONFIG_AHCI=y
|
||||||
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
|
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
|
||||||
CONFIG_SYS_EXTRA_OPTIONS="SATAPWR=SUNXI_GPC(3)"
|
|
||||||
CONFIG_SPL=y
|
CONFIG_SPL=y
|
||||||
CONFIG_SPL_I2C_SUPPORT=y
|
CONFIG_SPL_I2C_SUPPORT=y
|
||||||
# CONFIG_CMD_IMLS is not set
|
# CONFIG_CMD_IMLS is not set
|
||||||
|
@ -3,10 +3,10 @@ CONFIG_ARCH_SUNXI=y
|
|||||||
CONFIG_MACH_SUN7I=y
|
CONFIG_MACH_SUN7I=y
|
||||||
CONFIG_DRAM_CLK=384
|
CONFIG_DRAM_CLK=384
|
||||||
CONFIG_MMC0_CD_PIN="PH1"
|
CONFIG_MMC0_CD_PIN="PH1"
|
||||||
|
CONFIG_SATAPWR="PC3"
|
||||||
CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-olinuxino-lime"
|
CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-olinuxino-lime"
|
||||||
CONFIG_AHCI=y
|
CONFIG_AHCI=y
|
||||||
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
|
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
|
||||||
CONFIG_SYS_EXTRA_OPTIONS="SATAPWR=SUNXI_GPC(3)"
|
|
||||||
CONFIG_SPL=y
|
CONFIG_SPL=y
|
||||||
CONFIG_SPL_I2C_SUPPORT=y
|
CONFIG_SPL_I2C_SUPPORT=y
|
||||||
# CONFIG_CMD_IMLS is not set
|
# CONFIG_CMD_IMLS is not set
|
||||||
|
@ -6,10 +6,10 @@ CONFIG_MMC0_CD_PIN="PH1"
|
|||||||
CONFIG_MMC3_CD_PIN="PH11"
|
CONFIG_MMC3_CD_PIN="PH11"
|
||||||
CONFIG_MMC_SUNXI_SLOT_EXTRA=3
|
CONFIG_MMC_SUNXI_SLOT_EXTRA=3
|
||||||
CONFIG_VIDEO_VGA=y
|
CONFIG_VIDEO_VGA=y
|
||||||
|
CONFIG_SATAPWR="PB8"
|
||||||
CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-olinuxino-micro"
|
CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-olinuxino-micro"
|
||||||
CONFIG_AHCI=y
|
CONFIG_AHCI=y
|
||||||
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
|
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
|
||||||
CONFIG_SYS_EXTRA_OPTIONS="SATAPWR=SUNXI_GPB(8)"
|
|
||||||
CONFIG_SPL=y
|
CONFIG_SPL=y
|
||||||
CONFIG_SPL_I2C_SUPPORT=y
|
CONFIG_SPL_I2C_SUPPORT=y
|
||||||
# CONFIG_CMD_IMLS is not set
|
# CONFIG_CMD_IMLS is not set
|
||||||
|
@ -8,10 +8,10 @@ CONFIG_MMC3_PINS="PH"
|
|||||||
CONFIG_MMC_SUNXI_SLOT_EXTRA=3
|
CONFIG_MMC_SUNXI_SLOT_EXTRA=3
|
||||||
CONFIG_USB0_VBUS_PIN="PB9"
|
CONFIG_USB0_VBUS_PIN="PB9"
|
||||||
CONFIG_USB0_VBUS_DET="PH5"
|
CONFIG_USB0_VBUS_DET="PH5"
|
||||||
|
CONFIG_SATAPWR="PC3"
|
||||||
CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-olimex-som-evb"
|
CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-olimex-som-evb"
|
||||||
CONFIG_AHCI=y
|
CONFIG_AHCI=y
|
||||||
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
|
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
|
||||||
CONFIG_SYS_EXTRA_OPTIONS="SATAPWR=SUNXI_GPC(3)"
|
|
||||||
CONFIG_SPL=y
|
CONFIG_SPL=y
|
||||||
CONFIG_SPL_I2C_SUPPORT=y
|
CONFIG_SPL_I2C_SUPPORT=y
|
||||||
# CONFIG_CMD_IMLS is not set
|
# CONFIG_CMD_IMLS is not set
|
||||||
|
@ -3,10 +3,10 @@ CONFIG_ARCH_SUNXI=y
|
|||||||
CONFIG_MACH_SUN7I=y
|
CONFIG_MACH_SUN7I=y
|
||||||
CONFIG_DRAM_CLK=480
|
CONFIG_DRAM_CLK=480
|
||||||
CONFIG_MMC0_CD_PIN="PH1"
|
CONFIG_MMC0_CD_PIN="PH1"
|
||||||
|
CONFIG_SATAPWR="PB8"
|
||||||
CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-cubieboard2"
|
CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-cubieboard2"
|
||||||
CONFIG_AHCI=y
|
CONFIG_AHCI=y
|
||||||
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
|
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
|
||||||
CONFIG_SYS_EXTRA_OPTIONS="SATAPWR=SUNXI_GPB(8)"
|
|
||||||
CONFIG_SPL=y
|
CONFIG_SPL=y
|
||||||
CONFIG_SPL_I2C_SUPPORT=y
|
CONFIG_SPL_I2C_SUPPORT=y
|
||||||
# CONFIG_CMD_IMLS is not set
|
# CONFIG_CMD_IMLS is not set
|
||||||
|
@ -3,10 +3,10 @@ CONFIG_ARCH_SUNXI=y
|
|||||||
CONFIG_MACH_SUN4I=y
|
CONFIG_MACH_SUN4I=y
|
||||||
CONFIG_DRAM_CLK=480
|
CONFIG_DRAM_CLK=480
|
||||||
CONFIG_MMC0_CD_PIN="PH1"
|
CONFIG_MMC0_CD_PIN="PH1"
|
||||||
|
CONFIG_SATAPWR="PB8"
|
||||||
CONFIG_DEFAULT_DEVICE_TREE="sun4i-a10-cubieboard"
|
CONFIG_DEFAULT_DEVICE_TREE="sun4i-a10-cubieboard"
|
||||||
CONFIG_AHCI=y
|
CONFIG_AHCI=y
|
||||||
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
|
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
|
||||||
CONFIG_SYS_EXTRA_OPTIONS="SATAPWR=SUNXI_GPB(8)"
|
|
||||||
CONFIG_SPL=y
|
CONFIG_SPL=y
|
||||||
CONFIG_SPL_I2C_SUPPORT=y
|
CONFIG_SPL_I2C_SUPPORT=y
|
||||||
# CONFIG_CMD_IMLS is not set
|
# CONFIG_CMD_IMLS is not set
|
||||||
|
@ -7,11 +7,11 @@ CONFIG_USB0_VBUS_PIN="PH17"
|
|||||||
CONFIG_USB0_VBUS_DET="PH22"
|
CONFIG_USB0_VBUS_DET="PH22"
|
||||||
CONFIG_USB0_ID_DET="PH19"
|
CONFIG_USB0_ID_DET="PH19"
|
||||||
CONFIG_VIDEO_VGA=y
|
CONFIG_VIDEO_VGA=y
|
||||||
|
CONFIG_SATAPWR="PH12"
|
||||||
CONFIG_GMAC_TX_DELAY=1
|
CONFIG_GMAC_TX_DELAY=1
|
||||||
CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-cubietruck"
|
CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-cubietruck"
|
||||||
CONFIG_AHCI=y
|
CONFIG_AHCI=y
|
||||||
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
|
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
|
||||||
CONFIG_SYS_EXTRA_OPTIONS="SATAPWR=SUNXI_GPH(12)"
|
|
||||||
CONFIG_SPL=y
|
CONFIG_SPL=y
|
||||||
CONFIG_SPL_I2C_SUPPORT=y
|
CONFIG_SPL_I2C_SUPPORT=y
|
||||||
# CONFIG_CMD_IMLS is not set
|
# CONFIG_CMD_IMLS is not set
|
||||||
|
@ -3,10 +3,10 @@ CONFIG_ARCH_SUNXI=y
|
|||||||
CONFIG_MACH_SUN7I=y
|
CONFIG_MACH_SUN7I=y
|
||||||
CONFIG_DRAM_CLK=480
|
CONFIG_DRAM_CLK=480
|
||||||
CONFIG_MMC0_CD_PIN="PH1"
|
CONFIG_MMC0_CD_PIN="PH1"
|
||||||
|
CONFIG_SATAPWR="PB8"
|
||||||
CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-itead-ibox"
|
CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-itead-ibox"
|
||||||
CONFIG_AHCI=y
|
CONFIG_AHCI=y
|
||||||
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
|
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
|
||||||
CONFIG_SYS_EXTRA_OPTIONS="SATAPWR=SUNXI_GPB(8)"
|
|
||||||
CONFIG_SPL=y
|
CONFIG_SPL=y
|
||||||
CONFIG_SPL_I2C_SUPPORT=y
|
CONFIG_SPL_I2C_SUPPORT=y
|
||||||
# CONFIG_CMD_IMLS is not set
|
# CONFIG_CMD_IMLS is not set
|
||||||
|
@ -3,11 +3,12 @@ CONFIG_ARCH_SUNXI=y
|
|||||||
CONFIG_MACH_SUN7I=y
|
CONFIG_MACH_SUN7I=y
|
||||||
CONFIG_DRAM_CLK=432
|
CONFIG_DRAM_CLK=432
|
||||||
CONFIG_MMC0_CD_PIN="PH10"
|
CONFIG_MMC0_CD_PIN="PH10"
|
||||||
|
CONFIG_SATAPWR="PB3"
|
||||||
CONFIG_GMAC_TX_DELAY=4
|
CONFIG_GMAC_TX_DELAY=4
|
||||||
CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-lamobo-r1"
|
CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-lamobo-r1"
|
||||||
CONFIG_AHCI=y
|
CONFIG_AHCI=y
|
||||||
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
|
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
|
||||||
CONFIG_SYS_EXTRA_OPTIONS="MACPWR=SUNXI_GPH(23),SATAPWR=SUNXI_GPB(3)"
|
CONFIG_SYS_EXTRA_OPTIONS="MACPWR=SUNXI_GPH(23)"
|
||||||
CONFIG_SPL=y
|
CONFIG_SPL=y
|
||||||
CONFIG_SPL_I2C_SUPPORT=y
|
CONFIG_SPL_I2C_SUPPORT=y
|
||||||
# CONFIG_CMD_IMLS is not set
|
# CONFIG_CMD_IMLS is not set
|
||||||
|
@ -4,11 +4,11 @@ CONFIG_MACH_SUN7I=y
|
|||||||
CONFIG_DRAM_CLK=408
|
CONFIG_DRAM_CLK=408
|
||||||
CONFIG_DRAM_ZQ=122
|
CONFIG_DRAM_ZQ=122
|
||||||
CONFIG_USB1_VBUS_PIN="PH11"
|
CONFIG_USB1_VBUS_PIN="PH11"
|
||||||
|
CONFIG_SATAPWR="PH2"
|
||||||
CONFIG_GMAC_TX_DELAY=3
|
CONFIG_GMAC_TX_DELAY=3
|
||||||
CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-pcduino3-nano"
|
CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-pcduino3-nano"
|
||||||
CONFIG_AHCI=y
|
CONFIG_AHCI=y
|
||||||
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
|
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
|
||||||
CONFIG_SYS_EXTRA_OPTIONS="SATAPWR=SUNXI_GPH(2)"
|
|
||||||
CONFIG_SPL=y
|
CONFIG_SPL=y
|
||||||
CONFIG_SPL_I2C_SUPPORT=y
|
CONFIG_SPL_I2C_SUPPORT=y
|
||||||
# CONFIG_CMD_IMLS is not set
|
# CONFIG_CMD_IMLS is not set
|
||||||
|
@ -3,10 +3,10 @@ CONFIG_ARCH_SUNXI=y
|
|||||||
CONFIG_MACH_SUN7I=y
|
CONFIG_MACH_SUN7I=y
|
||||||
CONFIG_DRAM_CLK=480
|
CONFIG_DRAM_CLK=480
|
||||||
CONFIG_DRAM_ZQ=122
|
CONFIG_DRAM_ZQ=122
|
||||||
|
CONFIG_SATAPWR="PH2"
|
||||||
CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-pcduino3"
|
CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-pcduino3"
|
||||||
CONFIG_AHCI=y
|
CONFIG_AHCI=y
|
||||||
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
|
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
|
||||||
CONFIG_SYS_EXTRA_OPTIONS="SATAPWR=SUNXI_GPH(2)"
|
|
||||||
CONFIG_SPL=y
|
CONFIG_SPL=y
|
||||||
CONFIG_SPL_I2C_SUPPORT=y
|
CONFIG_SPL_I2C_SUPPORT=y
|
||||||
# CONFIG_CMD_IMLS is not set
|
# CONFIG_CMD_IMLS is not set
|
||||||
|
@ -11,9 +11,9 @@ CONFIG_USB0_VBUS_DET="AXP0-VBUS-DETECT"
|
|||||||
CONFIG_USB0_ID_DET="PH11"
|
CONFIG_USB0_ID_DET="PH11"
|
||||||
CONFIG_USB1_VBUS_PIN="PD24"
|
CONFIG_USB1_VBUS_PIN="PD24"
|
||||||
CONFIG_AXP_GPIO=y
|
CONFIG_AXP_GPIO=y
|
||||||
|
CONFIG_SATAPWR="PD25"
|
||||||
CONFIG_DEFAULT_DEVICE_TREE="sun8i-a83t-sinovoip-bpi-m3"
|
CONFIG_DEFAULT_DEVICE_TREE="sun8i-a83t-sinovoip-bpi-m3"
|
||||||
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
|
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
|
||||||
CONFIG_SYS_EXTRA_OPTIONS="SATAPWR=SUNXI_GPD(25)"
|
|
||||||
CONFIG_CONSOLE_MUX=y
|
CONFIG_CONSOLE_MUX=y
|
||||||
CONFIG_SPL=y
|
CONFIG_SPL=y
|
||||||
# CONFIG_CMD_IMLS is not set
|
# CONFIG_CMD_IMLS is not set
|
||||||
|
@ -6,9 +6,10 @@ CONFIG_DRAM_ZQ=3881979
|
|||||||
CONFIG_DRAM_ODT_EN=y
|
CONFIG_DRAM_ODT_EN=y
|
||||||
CONFIG_MMC_SUNXI_SLOT_EXTRA=2
|
CONFIG_MMC_SUNXI_SLOT_EXTRA=2
|
||||||
CONFIG_USB1_VBUS_PIN="PG13"
|
CONFIG_USB1_VBUS_PIN="PG13"
|
||||||
|
CONFIG_SATAPWR="PG11"
|
||||||
CONFIG_DEFAULT_DEVICE_TREE="sun8i-h3-orangepi-plus"
|
CONFIG_DEFAULT_DEVICE_TREE="sun8i-h3-orangepi-plus"
|
||||||
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
|
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
|
||||||
CONFIG_SYS_EXTRA_OPTIONS="SATAPWR=SUNXI_GPG(11),MACPWR=SUNXI_GPD(6)"
|
CONFIG_SYS_EXTRA_OPTIONS="MACPWR=SUNXI_GPD(6)"
|
||||||
CONFIG_CONSOLE_MUX=y
|
CONFIG_CONSOLE_MUX=y
|
||||||
CONFIG_SPL=y
|
CONFIG_SPL=y
|
||||||
CONFIG_SPL_I2C_SUPPORT=y
|
CONFIG_SPL_I2C_SUPPORT=y
|
||||||
|
Loading…
Reference in New Issue
Block a user