Skip to contentSkip to conversation

sunxi: musb: Drop no longer accurate comment in Kconfig help text

PATCH New Hans de Goede 3 participants 7 messages Aug 16, 2015 – Aug 17, 2015

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/3 sunxi: musb: Drop no longer accurate comment in Kconfig help text

Drop the no longer accurate part of the USB_MUSB_SUNXI Kconfig help text, since the musb-host code now supports the device-model, ehci and musb in host mode can both be enabled at the same time without issues.

---
 drivers/usb/musb-new/Kconfig | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)
drivers/usb/musb-new/Kconfig +1 -3
index 0082ff8..6a6cb93 100644
@@ -21,8 +21,6 @@ config USB_MUSB_SUNXI
 	default y
 	---help---
 	Say y here to enable support for the sunxi OTG / DRC USB controller
-	used on almost all sunxi boards. Note currently u-boot can only have
-	one usb host controller enabled at a time, so enabling this on boards
-	which also use the ehci host controller will result in build errors.
+	used on almost all sunxi boards.
 
 endif
Signature · 1 line
2.4.3
#1 lore raw

PATCH 2/3 sunxi: Drop LCD_MODE from A13-OLinuxIno defconfigs

With the unified / cleaned up default display output selection changes, which were done as part of adding composite video out support, our example LCD_MODE line in the A13-OLinuxIno defconfigs causes the display code to setup a LCD console by default, rather then a VGA console.

Given that the LCD console is only useful for people who have hooked up the exact lcd-panel from the config, while most people will not have any lcd panel connected to these boards, this is not a good default.

Dropping the LCD_MODE line which was intended as an example fixes this, instead add a link to the LCD_MODE help text pointing to
http://linux-sunxi.org/LCD which contains the removed and other example modes.

---
 board/sunxi/Kconfig              | 1 +
 configs/A13-OLinuXinoM_defconfig | 1 -
 configs/A13-OLinuXino_defconfig  | 1 -
 3 files changed, 1 insertion(+), 2 deletions(-)
board/sunxi/Kconfig +1 -0
index fd6668f..55906b5 100644
@@ -425,6 +425,7 @@ config VIDEO_LCD_MODE
 	LCD panel timing details string, leave empty if there is no LCD panel.
 	This is in drivers/video/videomodes.c: video_get_params() format, e.g.
 	x:800,y:480,depth:18,pclk_khz:33000,le:16,ri:209,up:22,lo:22,hs:30,vs:1,sync:0,vmode:0
+	Also see: http://linux-sunxi.org/LCD
 
 config VIDEO_LCD_DCLK_PHASE
 	int "LCD panel display clock phase"
configs/A13-OLinuXinoM_defconfig +0 -1
index dcaaff9..5852be6 100644
@@ -7,7 +7,6 @@ CONFIG_USB1_VBUS_PIN="PG11"
 # CONFIG_VIDEO_HDMI is not set
 CONFIG_VIDEO_VGA_VIA_LCD=y
 CONFIG_VIDEO_VGA_VIA_LCD_FORCE_SYNC_ACTIVE_HIGH=y
-CONFIG_VIDEO_LCD_MODE="x:800,y:480,depth:18,pclk_khz:33000,le:16,ri:209,up:22,lo:22,hs:30,vs:1,sync:3,vmode:0"
 CONFIG_VIDEO_LCD_POWER="PB10"
 CONFIG_VIDEO_LCD_BL_PWM="PB2"
 CONFIG_DEFAULT_DEVICE_TREE="sun5i-a13-olinuxino-micro"
configs/A13-OLinuXino_defconfig +0 -1
index eed53d5..a2e7c38 100644
@@ -8,7 +8,6 @@ CONFIG_AXP_GPIO=y
 # CONFIG_VIDEO_HDMI is not set
 CONFIG_VIDEO_VGA_VIA_LCD=y
 CONFIG_VIDEO_VGA_VIA_LCD_FORCE_SYNC_ACTIVE_HIGH=y
-CONFIG_VIDEO_LCD_MODE="x:800,y:480,depth:18,pclk_khz:33000,le:16,ri:209,up:22,lo:22,hs:30,vs:1,sync:3,vmode:0"
 CONFIG_VIDEO_LCD_POWER="AXP0-0"
 CONFIG_VIDEO_LCD_BL_PWM="PB2"
 CONFIG_DEFAULT_DEVICE_TREE="sun5i-a13-olinuxino"
Signature · 1 line
2.4.3
#2 lore raw

PATCH 2/3 sunxi: Drop LCD_MODE from A13-OLinuxIno defconfigs

Quoted 9 lines · Hans de Goede

With the unified / cleaned up default display output selection changes, which were done as part of adding composite video out support, our example LCD_MODE line in the A13-OLinuxIno defconfigs causes the display code to setup a LCD console by default, rather then a VGA console.

Given that the LCD console is only useful for people who have hooked up the exact lcd-panel from the config, while most people will not have any lcd panel connected to these boards, this is not a good default.

Quoted 6 lines

Dropping the LCD_MODE line which was intended as an example fixes this, instead add a link to the LCD_MODE help text pointing to
http://linux-sunxi.org/LCD which contains the removed and other example modes.

#3 lore raw

PATCH 3/3 sunxi: Add CONFIG_MMC0_CD_PIN to various boards

In reply to Hans de Goede

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).

---
 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(+)
configs/A10-OLinuXino-Lime_defconfig +1 -0
index 0245bfc..ee219f8 100644
@@ -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
configs/A13-OLinuXinoM_defconfig +1 -0
index 5852be6..ccf35c7 100644
@@ -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
configs/A13-OLinuXino_defconfig +1 -0
index a2e7c38..ef239a98 100644
@@ -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
configs/A20-OLinuXino-Lime_defconfig +1 -0
index fb1f240..4a257b3 100644
@@ -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
configs/Cubieboard_defconfig +1 -0
index b2f5d09..819fffd 100644
@@ -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
configs/Cubietruck_defconfig +1 -0
index ebd45b3..7a188d3 100644
@@ -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"
Signature · 1 line
2.4.3
#4 lore raw

PATCH 3/3 sunxi: Add CONFIG_MMC0_CD_PIN to various boards

Quoted 1 line · Hans de Goede

Add CONFIG_MMC0_CD_PIN to various boards, this stoos the SPL from still

                                                 ^^^^^
                                                 stops
Quoted 92 lines

trying to access the sdcard when there is none (e.g. when booting from nand).

---
 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(+)
configs/A10-OLinuXino-Lime_defconfig +1 -0
index 0245bfc..ee219f8 100644
@@ -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
configs/A13-OLinuXinoM_defconfig +1 -0
index 5852be6..ccf35c7 100644
@@ -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
configs/A13-OLinuXino_defconfig +1 -0
index a2e7c38..ef239a98 100644
@@ -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
configs/A20-OLinuXino-Lime_defconfig +1 -0
index fb1f240..4a257b3 100644
@@ -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
configs/Cubieboard_defconfig +1 -0
index b2f5d09..819fffd 100644
@@ -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
configs/Cubietruck_defconfig +1 -1
index ebd45b3..7a188d3 100644
@@ -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 at lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot