| Message ID | 1439717983-15234-3-git-send-email-hdegoede@redhat.com |
|---|---|
| State | Accepted |
| Delegated to: | Hans de Goede |
| Headers | show |
On Sun, Aug 16, 2015 at 5:39 PM, Hans de Goede <hdegoede@redhat.com> wrote: > Add CONFIG_MMC0_CD_PIN to various boards, this stoos the SPL from still ^^^^^ stops > trying to access the sdcard when there is none (e.g. when booting from > nand). > > Signed-off-by: Hans de Goede <hdegoede@redhat.com> > --- > configs/A10-OLinuXino-Lime_defconfig | 1 + > configs/A13-OLinuXinoM_defconfig | 1 + > configs/A13-OLinuXino_defconfig | 1 + > configs/A20-OLinuXino-Lime_defconfig | 1 + > configs/Cubieboard_defconfig | 1 + > configs/Cubietruck_defconfig | 1 + > 6 files changed, 6 insertions(+) > > diff --git a/configs/A10-OLinuXino-Lime_defconfig b/configs/A10-OLinuXino-Lime_defconfig > index 0245bfc..ee219f8 100644 > --- a/configs/A10-OLinuXino-Lime_defconfig > +++ b/configs/A10-OLinuXino-Lime_defconfig > @@ -3,6 +3,7 @@ CONFIG_ARCH_SUNXI=y > CONFIG_MACH_SUN4I=y > CONFIG_DRAM_CLK=480 > CONFIG_DRAM_EMR1=4 > +CONFIG_MMC0_CD_PIN="PH1" > CONFIG_SYS_CLK_FREQ=912000000 > CONFIG_DEFAULT_DEVICE_TREE="sun4i-a10-olinuxino-lime" > # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set > diff --git a/configs/A13-OLinuXinoM_defconfig b/configs/A13-OLinuXinoM_defconfig > index 5852be6..ccf35c7 100644 > --- a/configs/A13-OLinuXinoM_defconfig > +++ b/configs/A13-OLinuXinoM_defconfig > @@ -3,6 +3,7 @@ CONFIG_ARCH_SUNXI=y > CONFIG_MACH_SUN5I=y > CONFIG_DRAM_CLK=408 > CONFIG_DRAM_EMR1=0 > +CONFIG_MMC0_CD_PIN="PG0" > CONFIG_USB1_VBUS_PIN="PG11" > # CONFIG_VIDEO_HDMI is not set > CONFIG_VIDEO_VGA_VIA_LCD=y > diff --git a/configs/A13-OLinuXino_defconfig b/configs/A13-OLinuXino_defconfig > index a2e7c38..ef239a98 100644 > --- a/configs/A13-OLinuXino_defconfig > +++ b/configs/A13-OLinuXino_defconfig > @@ -3,6 +3,7 @@ CONFIG_ARCH_SUNXI=y > CONFIG_MACH_SUN5I=y > CONFIG_DRAM_CLK=408 > CONFIG_DRAM_EMR1=0 > +CONFIG_MMC0_CD_PIN="PG0" > CONFIG_USB1_VBUS_PIN="PG11" > CONFIG_AXP_GPIO=y > # CONFIG_VIDEO_HDMI is not set > diff --git a/configs/A20-OLinuXino-Lime_defconfig b/configs/A20-OLinuXino-Lime_defconfig > index fb1f240..4a257b3 100644 > --- a/configs/A20-OLinuXino-Lime_defconfig > +++ b/configs/A20-OLinuXino-Lime_defconfig > @@ -2,6 +2,7 @@ CONFIG_ARM=y > CONFIG_ARCH_SUNXI=y > CONFIG_MACH_SUN7I=y > CONFIG_DRAM_CLK=480 > +CONFIG_MMC0_CD_PIN="PH1" > CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-olinuxino-lime" > # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set > CONFIG_SPL=y > diff --git a/configs/Cubieboard_defconfig b/configs/Cubieboard_defconfig > index b2f5d09..819fffd 100644 > --- a/configs/Cubieboard_defconfig > +++ b/configs/Cubieboard_defconfig > @@ -2,6 +2,7 @@ CONFIG_ARM=y > CONFIG_ARCH_SUNXI=y > CONFIG_MACH_SUN4I=y > CONFIG_DRAM_CLK=480 > +CONFIG_MMC0_CD_PIN="PH1" > CONFIG_DEFAULT_DEVICE_TREE="sun4i-a10-cubieboard" > # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set > CONFIG_SPL=y > diff --git a/configs/Cubietruck_defconfig b/configs/Cubietruck_defconfig > index ebd45b3..7a188d3 100644 > --- a/configs/Cubietruck_defconfig > +++ b/configs/Cubietruck_defconfig > @@ -2,6 +2,7 @@ CONFIG_ARM=y > CONFIG_ARCH_SUNXI=y > CONFIG_MACH_SUN7I=y > CONFIG_DRAM_CLK=432 > +CONFIG_MMC0_CD_PIN="PH1" > CONFIG_VIDEO_VGA=y > CONFIG_GMAC_TX_DELAY=1 > CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-cubietruck" > -- > 2.4.3 > > _______________________________________________ > U-Boot mailing list > U-Boot@lists.denx.de > http://lists.denx.de/mailman/listinfo/u-boot
On Sun, 2015-08-16 at 11:39 +0200, Hans de Goede wrote: > Add CONFIG_MMC0_CD_PIN to various boards, this stoos the SPL from still stops > trying to access the sdcard when there is none (e.g. when booting from > nand). > > Signed-off-by: Hans de Goede <hdegoede@redhat.com> Acked-by: Ian Campbell <ijc@hellion.org.uk>
diff --git a/configs/A10-OLinuXino-Lime_defconfig b/configs/A10-OLinuXino-Lime_defconfig index 0245bfc..ee219f8 100644 --- a/configs/A10-OLinuXino-Lime_defconfig +++ b/configs/A10-OLinuXino-Lime_defconfig @@ -3,6 +3,7 @@ CONFIG_ARCH_SUNXI=y CONFIG_MACH_SUN4I=y CONFIG_DRAM_CLK=480 CONFIG_DRAM_EMR1=4 +CONFIG_MMC0_CD_PIN="PH1" CONFIG_SYS_CLK_FREQ=912000000 CONFIG_DEFAULT_DEVICE_TREE="sun4i-a10-olinuxino-lime" # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set diff --git a/configs/A13-OLinuXinoM_defconfig b/configs/A13-OLinuXinoM_defconfig index 5852be6..ccf35c7 100644 --- a/configs/A13-OLinuXinoM_defconfig +++ b/configs/A13-OLinuXinoM_defconfig @@ -3,6 +3,7 @@ CONFIG_ARCH_SUNXI=y CONFIG_MACH_SUN5I=y CONFIG_DRAM_CLK=408 CONFIG_DRAM_EMR1=0 +CONFIG_MMC0_CD_PIN="PG0" CONFIG_USB1_VBUS_PIN="PG11" # CONFIG_VIDEO_HDMI is not set CONFIG_VIDEO_VGA_VIA_LCD=y diff --git a/configs/A13-OLinuXino_defconfig b/configs/A13-OLinuXino_defconfig index a2e7c38..ef239a98 100644 --- a/configs/A13-OLinuXino_defconfig +++ b/configs/A13-OLinuXino_defconfig @@ -3,6 +3,7 @@ CONFIG_ARCH_SUNXI=y CONFIG_MACH_SUN5I=y CONFIG_DRAM_CLK=408 CONFIG_DRAM_EMR1=0 +CONFIG_MMC0_CD_PIN="PG0" CONFIG_USB1_VBUS_PIN="PG11" CONFIG_AXP_GPIO=y # CONFIG_VIDEO_HDMI is not set diff --git a/configs/A20-OLinuXino-Lime_defconfig b/configs/A20-OLinuXino-Lime_defconfig index fb1f240..4a257b3 100644 --- a/configs/A20-OLinuXino-Lime_defconfig +++ b/configs/A20-OLinuXino-Lime_defconfig @@ -2,6 +2,7 @@ CONFIG_ARM=y CONFIG_ARCH_SUNXI=y CONFIG_MACH_SUN7I=y CONFIG_DRAM_CLK=480 +CONFIG_MMC0_CD_PIN="PH1" CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-olinuxino-lime" # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set CONFIG_SPL=y diff --git a/configs/Cubieboard_defconfig b/configs/Cubieboard_defconfig index b2f5d09..819fffd 100644 --- a/configs/Cubieboard_defconfig +++ b/configs/Cubieboard_defconfig @@ -2,6 +2,7 @@ CONFIG_ARM=y CONFIG_ARCH_SUNXI=y CONFIG_MACH_SUN4I=y CONFIG_DRAM_CLK=480 +CONFIG_MMC0_CD_PIN="PH1" CONFIG_DEFAULT_DEVICE_TREE="sun4i-a10-cubieboard" # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set CONFIG_SPL=y diff --git a/configs/Cubietruck_defconfig b/configs/Cubietruck_defconfig index ebd45b3..7a188d3 100644 --- a/configs/Cubietruck_defconfig +++ b/configs/Cubietruck_defconfig @@ -2,6 +2,7 @@ CONFIG_ARM=y CONFIG_ARCH_SUNXI=y CONFIG_MACH_SUN7I=y CONFIG_DRAM_CLK=432 +CONFIG_MMC0_CD_PIN="PH1" CONFIG_VIDEO_VGA=y CONFIG_GMAC_TX_DELAY=1 CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-cubietruck"
Add CONFIG_MMC0_CD_PIN to various boards, this stoos the SPL from still trying to access the sdcard when there is none (e.g. when booting from nand). Signed-off-by: Hans de Goede <hdegoede@redhat.com> --- configs/A10-OLinuXino-Lime_defconfig | 1 + configs/A13-OLinuXinoM_defconfig | 1 + configs/A13-OLinuXino_defconfig | 1 + configs/A20-OLinuXino-Lime_defconfig | 1 + configs/Cubieboard_defconfig | 1 + configs/Cubietruck_defconfig | 1 + 6 files changed, 6 insertions(+)