[PATCH 00/13] Nokia RX-51: Fix USB TTY console and enable it
This patch series fix usbtty code (serial console via USB peripheral mode), fix underlying musb peripheral code, fix compilation of CONFIG_USB_DEVICE (used by usbtty), remove unused Nokia RX-51 code to decrease size of U-Boot binary and finally enable usbtty serial console for Nokia RX-51.
With this patch series debugging of Nokia RX-51 can be done also via USB serial console.
On computer this serial console is accessible via /dev/ttyACM0 device.
With current implementation there is an issue in musb driver that it loose receiving bytes from USB bus when too many a characters are send over USB tty from computer. Typing on keyboard to kermit terminal connected to /dev/ttyACM0 is working fine. But pasting more more bytes to terminal cause data lost on receiving side. I do not know where is the issue or how to fix it (it looks like that data are lost at low level when reading them from msub FIFO hardware) but typing on keyboard is working fine. This is rather issue for sending files via x/y/z-modem or kermit protocol. Currently U-Boot is not able to receive any file via usbtty with musb driver due to this issue.
Pali Rohár (13): serial: usbtty: Fix puts function usb: musb: Fix compilation of gadget code usb: musb: Always clear the data toggle bit when configuring ep usb: musb: Fix configuring FIFO for endpoints usb: musb: Read value of PERI_RXCSR to 16bit variable usb: musb: Fix transmission of bigger buffers usb: gadget: Do not export usbd_device_* arrays usb: gadget: Use dbg_ep0() macro instead of serial_printf() arm: omap3: Compile lowlevel_init() function only when it is used arm: omap3: Compile s_init() function only when it is used Nokia RX-51: Remove function set_muxconf_regs() Nokia RX-51: Move content of rx51.h to rx51.c Nokia RX-51: Enable usbtty serial console by default
Makefile | 1 + arch/arm/mach-omap2/omap3/board.c | 3 + arch/arm/mach-omap2/omap3/lowlevel_init.S | 6 +- board/nokia/rx51/rx51.c | 28 +- board/nokia/rx51/rx51.h | 377 ---------------------- configs/nokia_rx51_defconfig | 6 +- doc/README.nokia_rx51 | 15 +- drivers/serial/usbtty.c | 4 +- drivers/usb/gadget/core.c | 38 +-- drivers/usb/gadget/ep0.c | 47 ++- drivers/usb/musb/musb_core.c | 10 +- drivers/usb/musb/musb_udc.c | 19 +- include/configs/nokia_rx51.h | 16 +- include/usbdevice.h | 15 - 14 files changed, 92 insertions(+), 493 deletions(-) delete mode 100644 board/nokia/rx51/rx51.h
This function has incorrect implementation of prepending CR prior LF. Without this patch it prepended CR prior whole string which is going to be written and let LF without leading CR. Fix this issue by inserting CR at correct place to make output on usbtty serial console more readable.
Signed-off-by: Pali Rohár pali@kernel.org --- drivers/serial/usbtty.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/serial/usbtty.c b/drivers/serial/usbtty.c index f1c1a260da..02f8edf200 100644 --- a/drivers/serial/usbtty.c +++ b/drivers/serial/usbtty.c @@ -500,8 +500,8 @@ void usbtty_puts(struct stdio_dev *dev, const char *str) n = next_nl_pos (str);
if (str[n] == '\n') { - __usbtty_puts("\r", 1); - __usbtty_puts(str, n + 1); + __usbtty_puts(str, n); + __usbtty_puts("\r\n", 2); str += (n + 1); len -= (n + 1); } else {
On Sun 2020-11-29 17:46:06, Pali Rohár wrote:
This function has incorrect implementation of prepending CR prior LF. Without this patch it prepended CR prior whole string which is going to be written and let LF without leading CR. Fix this issue by inserting CR at correct place to make output on usbtty serial console more readable.
Signed-off-by: Pali Rohár pali@kernel.org
Reviewed-by: Pavel Machek pavel@ucw.cz
musb udc code depends on usb gadget code provided by CONFIG_USB_DEVICE and defined in drivers/usb/gadget/Makefile. But this Makefile is not included into U-Boot build when CONFIG_USB_GADGET is not set. As CONFIG_USB_DEVICE cannot be enabled together with CONFIG_USB_GADGET it means that dependency for musb udc code is not compiled during build. Fix it by including drivers/usb/gadget dependency also when CONFIG_USB_DEVICE is set.
This patch fixes compile errors:
arm-linux-gnueabi-ld.bfd: drivers/usb/musb/built-in.o: in function `musb_peri_ep0_rx': u-boot/drivers/usb/musb/musb_udc.c: undefined reference to `ep0_recv_setup' arm-linux-gnueabi-ld.bfd: drivers/usb/musb/built-in.o: in function `musb_peri_ep0_idle': u-boot/drivers/usb/musb/musb_udc.c: undefined reference to `ep0_recv_setup' arm-linux-gnueabi-ld.bfd: drivers/usb/musb/built-in.o: in function `musb_peri_ep0_zero_data_request': u-boot/drivers/usb/musb/musb_udc.c: undefined reference to `usbd_device_event_irq' arm-linux-gnueabi-ld.bfd: drivers/usb/musb/built-in.o: in function `musb_peri_ep0_idle': u-boot/drivers/usb/musb/musb_udc.c: undefined reference to `ep0_recv_setup' arm-linux-gnueabi-ld.bfd: drivers/usb/musb/built-in.o: in function `musb_peri_ep0_rx': u-boot/drivers/usb/musb/musb_udc.c: undefined reference to `usbd_rcv_complete' arm-linux-gnueabi-ld.bfd: drivers/usb/musb/built-in.o: in function `musb_peri_rx_ep': u-boot/drivers/usb/musb/musb_udc.c: undefined reference to `usbd_rcv_complete' arm-linux-gnueabi-ld.bfd: drivers/usb/musb/built-in.o: in function `udc_endpoint_write': u-boot/drivers/usb/musb/musb_udc.c: undefined reference to `usbd_tx_complete' arm-linux-gnueabi-ld.bfd: drivers/usb/musb/built-in.o: in function `udc_irq': u-boot/drivers/usb/musb/musb_udc.c: undefined reference to `usbd_device_event_irq' arm-linux-gnueabi-ld.bfd: u-boot/drivers/usb/musb/musb_udc.c: undefined reference to `usbd_device_event_irq' arm-linux-gnueabi-ld.bfd: u-boot/drivers/usb/musb/musb_udc.c: undefined reference to `usbd_device_event_irq' arm-linux-gnueabi-ld.bfd: u-boot/drivers/usb/musb/musb_udc.c: undefined reference to `usbd_device_event_irq' arm-linux-gnueabi-ld.bfd: u-boot/drivers/usb/musb/musb_udc.c: undefined reference to `usbd_device_event_irq' arm-linux-gnueabi-ld.bfd: drivers/usb/musb/built-in.o:u-boot/drivers/usb/musb/musb_udc.c: more undefined references to `usbd_device_event_irq' follow arm-linux-gnueabi-ld.bfd: drivers/usb/musb/built-in.o: in function `udc_setup_ep': u-boot/drivers/usb/musb/musb_udc.c: undefined reference to `usbd_alloc_urb' arm-linux-gnueabi-ld.bfd: drivers/usb/musb/built-in.o: in function `udc_startup_events': u-boot/drivers/usb/musb/musb_udc.c: undefined reference to `usbd_device_event_irq' arm-linux-gnueabi-ld.bfd: u-boot/drivers/usb/musb/musb_udc.c: undefined reference to `usbd_device_event_irq' arm-linux-gnueabi-ld.bfd: u-boot/drivers/usb/musb/musb_udc.c: undefined reference to `usbd_device_event_irq' make: *** [Makefile:1762: u-boot] Error 1
Signed-off-by: Pali Rohár pali@kernel.org --- Makefile | 1 + 1 file changed, 1 insertion(+)
diff --git a/Makefile b/Makefile index 17719666fb..8b146db22c 100644 --- a/Makefile +++ b/Makefile @@ -792,6 +792,7 @@ libs-y += drivers/usb/dwc3/ libs-y += drivers/usb/common/ libs-y += drivers/usb/emul/ libs-y += drivers/usb/eth/ +libs-$(CONFIG_USB_DEVICE) += drivers/usb/gadget/ libs-$(CONFIG_USB_GADGET) += drivers/usb/gadget/ libs-$(CONFIG_USB_GADGET) += drivers/usb/gadget/udc/ libs-y += drivers/usb/host/
On Sun 2020-11-29 17:46:07, Pali Rohár wrote:
musb udc code depends on usb gadget code provided by CONFIG_USB_DEVICE and defined in drivers/usb/gadget/Makefile. But this Makefile is not included into U-Boot build when CONFIG_USB_GADGET is not set. As CONFIG_USB_DEVICE cannot be enabled together with CONFIG_USB_GADGET it means that dependency for musb udc code is not compiled during build. Fix it by including drivers/usb/gadget dependency also when CONFIG_USB_DEVICE is set.
_device_event_irq'
arm-linux-gnueabi-ld.bfd: drivers/usb/musb/built-in.o:u-boot/drivers/usb/musb/musb_udc.c: more undefined references to `usbd_device_event_irq' follow arm-linux-gnueabi-ld.bfd: drivers/usb/musb/built-in.o: in function `udc_setup_ep': u-boot/drivers/usb/musb/musb_udc.c: undefined reference to `usbd_alloc_urb' arm-linux-gnueabi-ld.bfd: drivers/usb/musb/built-in.o: in function `udc_startup_events': u-boot/drivers/usb/musb/musb_udc.c: undefined reference to `usbd_device_event_irq' arm-linux-gnueabi-ld.bfd: u-boot/drivers/usb/musb/musb_udc.c: undefined reference to `usbd_device_event_irq' arm-linux-gnueabi-ld.bfd: u-boot/drivers/usb/musb/musb_udc.c: undefined reference to `usbd_device_event_irq' make: *** [Makefile:1762: u-boot] Error 1
Signed-off-by: Pali Rohár pali@kernel.org
Reviewed-by: Pavel Machek pavel@ucw.cz
On Sunday 29 November 2020 18:52:13 Pavel Machek wrote:
On Sun 2020-11-29 17:46:07, Pali Rohár wrote:
musb udc code depends on usb gadget code provided by CONFIG_USB_DEVICE and defined in drivers/usb/gadget/Makefile. But this Makefile is not included into U-Boot build when CONFIG_USB_GADGET is not set. As CONFIG_USB_DEVICE cannot be enabled together with CONFIG_USB_GADGET it means that dependency for musb udc code is not compiled during build. Fix it by including drivers/usb/gadget dependency also when CONFIG_USB_DEVICE is set.
_device_event_irq'
arm-linux-gnueabi-ld.bfd: drivers/usb/musb/built-in.o:u-boot/drivers/usb/musb/musb_udc.c: more undefined references to `usbd_device_event_irq' follow arm-linux-gnueabi-ld.bfd: drivers/usb/musb/built-in.o: in function `udc_setup_ep': u-boot/drivers/usb/musb/musb_udc.c: undefined reference to `usbd_alloc_urb' arm-linux-gnueabi-ld.bfd: drivers/usb/musb/built-in.o: in function `udc_startup_events': u-boot/drivers/usb/musb/musb_udc.c: undefined reference to `usbd_device_event_irq' arm-linux-gnueabi-ld.bfd: u-boot/drivers/usb/musb/musb_udc.c: undefined reference to `usbd_device_event_irq' arm-linux-gnueabi-ld.bfd: u-boot/drivers/usb/musb/musb_udc.c: undefined reference to `usbd_device_event_irq' make: *** [Makefile:1762: u-boot] Error 1
Signed-off-by: Pali Rohár pali@kernel.org
Reviewed-by: Pavel Machek pavel@ucw.cz
PING!
I would like to remind this patch series as above compile error is still present in U-Boot v2021.01 version.
Without this patch it was done only when U-Boot was compiled with MUSB Host Controller. But it is needed also for MUSB Device Controller, otherwise Device Controller does not work.
Signed-off-by: Pali Rohár pali@kernel.org --- drivers/usb/musb/musb_core.c | 4 ---- 1 file changed, 4 deletions(-)
diff --git a/drivers/usb/musb/musb_core.c b/drivers/usb/musb/musb_core.c index 147b2eb929..cc6dc3839d 100644 --- a/drivers/usb/musb/musb_core.c +++ b/drivers/usb/musb/musb_core.c @@ -81,10 +81,8 @@ void musb_configure_ep(const struct musb_epinfo *epinfo, u8 cnt) config_fifo(tx, idx, fifoaddr);
csr = readw(&musbr->txcsr); -#if defined(CONFIG_USB_MUSB_HCD) /* clear the data toggle bit */ writew(csr | MUSB_TXCSR_CLRDATATOG, &musbr->txcsr); -#endif /* Flush fifo if required */ if (csr & MUSB_TXCSR_TXPKTRDY) writew(csr | MUSB_TXCSR_FLUSHFIFO, @@ -94,10 +92,8 @@ void musb_configure_ep(const struct musb_epinfo *epinfo, u8 cnt) config_fifo(rx, idx, fifoaddr);
csr = readw(&musbr->rxcsr); -#if defined(CONFIG_USB_MUSB_HCD) /* clear the data toggle bit */ writew(csr | MUSB_RXCSR_CLRDATATOG, &musbr->rxcsr); -#endif /* Flush fifo if required */ if (csr & MUSB_RXCSR_RXPKTRDY) writew(csr | MUSB_RXCSR_FLUSHFIFO,
On Sun 2020-11-29 17:46:08, Pali Rohár wrote:
Without this patch it was done only when U-Boot was compiled with MUSB Host Controller. But it is needed also for MUSB Device Controller, otherwise Device Controller does not work.
Signed-off-by: Pali Rohár pali@kernel.org
Reviewed-by: Pavel Machek pavel@ucw.cz
This patch fixes configuring FIFO for one-directional endpoints which have either RX or TX queue and therefore only one FIFO.
Without this patch if FIFO size was zero then idx was incorrectly calculated (expr. ffs(0)-1 is not zero) and size overflowed in fifosz register. This register uses has only 4 bits for FIFO size.
This patch is fixing it by setting zero size and zero address when particular endpoint does not use FIFO.
This issue caused loose of packets on USB bus in both directions and basically usbtty was unusable.
Signed-off-by: Pali Rohár pali@kernel.org --- drivers/usb/musb/musb_core.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/usb/musb/musb_core.c b/drivers/usb/musb/musb_core.c index cc6dc3839d..75ccd4819d 100644 --- a/drivers/usb/musb/musb_core.c +++ b/drivers/usb/musb/musb_core.c @@ -49,8 +49,8 @@ void musb_start(void) #else # define config_fifo(dir, idx, addr) \ do { \ - writeb(idx, &musbr->dir##fifosz); \ - writew(fifoaddr >> 3, &musbr->dir##fifoadd); \ + writeb((idx) & 0xF, &musbr->dir##fifosz); \ + writew((idx) ? ((addr) >> 3) : 0, &musbr->dir##fifoadd); \ } while (0) #endif
@@ -73,7 +73,7 @@ void musb_configure_ep(const struct musb_epinfo *epinfo, u8 cnt) while (cnt--) { /* prepare fifosize to write to register */ fifosize = epinfo->epsize >> 3; - idx = ffs(fifosize) - 1; + idx = fifosize ? (ffs(fifosize) - 1) : 0;
writeb(epinfo->epnum, &musbr->index); if (epinfo->epdir) {
On Sun 2020-11-29 17:46:09, Pali Rohár wrote:
This patch fixes configuring FIFO for one-directional endpoints which have either RX or TX queue and therefore only one FIFO.
Without this patch if FIFO size was zero then idx was incorrectly calculated (expr. ffs(0)-1 is not zero) and size overflowed in fifosz register. This register uses has only 4 bits for FIFO size.
This patch is fixing it by setting zero size and zero address when particular endpoint does not use FIFO.
This issue caused loose of packets on USB bus in both directions and basically usbtty was unusable.
Signed-off-by: Pali Rohár pali@kernel.org
Reviewed-by: Pavel Machek pavel@ucw.cz
This patch fixes configuring FIFO for one-directional endpoints which have either RX or TX queue and therefore only one FIFO.
Size of FIFO buffer is 2^(idx+3) bytes and starting address is 2^(addr+3). Moreover first 64 bytes are reserved for EP0.
Without this patch if FIFO size specified by caller was zero then idx was incorrectly calculated (expr. ffs(0)-1) and size overflowed in fifosz register. This register uses has only 4 bits for FIFO size. Moreover specifying zero size is not possible.
This patch is fixing calculation of start address and buffer size to minimal value and ensure that it would not overlap with reserved EP0 buffer.
This issue caused loose of packets on USB bus in both directions and basically usbtty was unusable.
Signed-off-by: Pali Rohár pali@kernel.org
--- Changes in v2: * Correctly calculate minimal buffer size * Store into fifoaddr address in musb units (8 bytes) --- drivers/usb/musb/musb_core.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/usb/musb/musb_core.c b/drivers/usb/musb/musb_core.c index cc6dc3839d..9651f074a4 100644 --- a/drivers/usb/musb/musb_core.c +++ b/drivers/usb/musb/musb_core.c @@ -50,7 +50,7 @@ void musb_start(void) # define config_fifo(dir, idx, addr) \ do { \ writeb(idx, &musbr->dir##fifosz); \ - writew(fifoaddr >> 3, &musbr->dir##fifoadd); \ + writew(addr, &musbr->dir##fifoadd); \ } while (0) #endif
@@ -66,14 +66,14 @@ void musb_start(void) void musb_configure_ep(const struct musb_epinfo *epinfo, u8 cnt) { u16 csr; - u16 fifoaddr = 64; /* First 64 bytes of FIFO reserved for EP0 */ + u16 fifoaddr = 64 >> 3; /* First 64 bytes of FIFO reserved for EP0 */ u32 fifosize; u8 idx;
while (cnt--) { /* prepare fifosize to write to register */ fifosize = epinfo->epsize >> 3; - idx = ffs(fifosize) - 1; + idx = fifosize ? ((ffs(fifosize) - 1) & 0xF) : 0;
writeb(epinfo->epnum, &musbr->index); if (epinfo->epdir) { @@ -99,7 +99,7 @@ void musb_configure_ep(const struct musb_epinfo *epinfo, u8 cnt) writew(csr | MUSB_RXCSR_FLUSHFIFO, &musbr->rxcsr); } - fifoaddr += epinfo->epsize; + fifoaddr += 1 << idx; epinfo++; } }
PERI_RXCSR is 16bit register so store its value into 16bit local variable.
Signed-off-by: Pali Rohár pali@kernel.org --- drivers/usb/musb/musb_udc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/usb/musb/musb_udc.c b/drivers/usb/musb/musb_udc.c index d901f8777c..67d1c56f9a 100644 --- a/drivers/usb/musb/musb_udc.c +++ b/drivers/usb/musb/musb_udc.c @@ -629,7 +629,7 @@ static void musb_peri_ep0(void) static void musb_peri_rx_ep(unsigned int ep) { u16 peri_rxcount; - u8 peri_rxcsr = readw(&musbr->ep[ep].epN.rxcsr); + u16 peri_rxcsr = readw(&musbr->ep[ep].epN.rxcsr);
if (!(peri_rxcsr & MUSB_RXCSR_RXPKTRDY)) { if (debug_level > 0)
On Sun 2020-11-29 17:46:10, Pali Rohár wrote:
PERI_RXCSR is 16bit register so store its value into 16bit local variable.
Signed-off-by: Pali Rohár pali@kernel.org
Reviewed-by: Pavel Machek pavel@ucw.cz
If udc_endpoint_write() was called with bigger payload which does not fit into one USB packet it needs to be transmitted in more USB packets. First packet is transmitted by udc_endpoint_write() call itself and other packets are put into waiting queue.
Implement function musb_peri_tx() which transmit checks when endpoints are ready and continue transmitting of waiting queue.
This patch fixes sending e.g. output of printenv command over usbtty serial console.
Signed-off-by: Pali Rohár pali@kernel.org --- drivers/usb/musb/musb_udc.c | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-)
diff --git a/drivers/usb/musb/musb_udc.c b/drivers/usb/musb/musb_udc.c index 67d1c56f9a..28719cc3f6 100644 --- a/drivers/usb/musb/musb_udc.c +++ b/drivers/usb/musb/musb_udc.c @@ -708,21 +708,16 @@ static void musb_peri_rx(u16 intr)
static void musb_peri_tx(u16 intr) { + unsigned int ep; + /* Check for EP0 */ if (0x01 & intr) musb_peri_ep0_tx();
- /* - * Use this in the future when handling epN tx - * - * u8 ep; - * - * for (ep = 1; ep < 16; ep++) { - * if ((1 << ep) & intr) { - * / * handle tx for this endpoint * / - * } - * } - */ + for (ep = 1; ep < 16; ep++) { + if ((1 << ep) & intr) + udc_endpoint_write(GET_ENDPOINT(udc_device, ep)); + } }
void udc_irq(void)
On Sun 2020-11-29 17:46:11, Pali Rohár wrote:
If udc_endpoint_write() was called with bigger payload which does not fit into one USB packet it needs to be transmitted in more USB packets. First packet is transmitted by udc_endpoint_write() call itself and other packets are put into waiting queue.
Implement function musb_peri_tx() which transmit checks when endpoints are ready and continue transmitting of waiting queue.
This patch fixes sending e.g. output of printenv command over usbtty serial console.
Signed-off-by: Pali Rohár pali@kernel.org
Reviewed-by: Pavel Machek pavel@ucw.cz
Each array is used only in one file (core.c or ep0.c). Move their content to correct file, mark them as static and do not export out of current file.
This change allows to decrease size of u-boot.bin as more of those strings are not used.
Signed-off-by: Pali Rohár pali@kernel.org --- drivers/usb/gadget/core.c | 38 ++++++++------------------------------ drivers/usb/gadget/ep0.c | 31 +++++++++++++++++++++++++++++++ include/usbdevice.h | 15 --------------- 3 files changed, 39 insertions(+), 45 deletions(-)
diff --git a/drivers/usb/gadget/core.c b/drivers/usb/gadget/core.c index 3781d25fd6..c86ee2f849 100644 --- a/drivers/usb/gadget/core.c +++ b/drivers/usb/gadget/core.c @@ -36,7 +36,7 @@ extern struct usb_function_driver ep0_driver; int registered_functions; int registered_devices;
-char *usbd_device_events[] = { +__maybe_unused static char *usbd_device_events[] = { "DEVICE_UNKNOWN", "DEVICE_INIT", "DEVICE_CREATE", @@ -56,34 +56,7 @@ char *usbd_device_events[] = { "DEVICE_FUNCTION_PRIVATE", };
-char *usbd_device_states[] = { - "STATE_INIT", - "STATE_CREATED", - "STATE_ATTACHED", - "STATE_POWERED", - "STATE_DEFAULT", - "STATE_ADDRESSED", - "STATE_CONFIGURED", - "STATE_UNKNOWN", -}; - -char *usbd_device_requests[] = { - "GET STATUS", /* 0 */ - "CLEAR FEATURE", /* 1 */ - "RESERVED", /* 2 */ - "SET FEATURE", /* 3 */ - "RESERVED", /* 4 */ - "SET ADDRESS", /* 5 */ - "GET DESCRIPTOR", /* 6 */ - "SET DESCRIPTOR", /* 7 */ - "GET CONFIGURATION", /* 8 */ - "SET CONFIGURATION", /* 9 */ - "GET INTERFACE", /* 10 */ - "SET INTERFACE", /* 11 */ - "SYNC FRAME", /* 12 */ -}; - -char *usbd_device_descriptors[] = { +__maybe_unused static char *usbd_device_descriptors[] = { "UNKNOWN", /* 0 */ "DEVICE", /* 1 */ "CONFIG", /* 2 */ @@ -95,13 +68,18 @@ char *usbd_device_descriptors[] = { "INTERFACE POWER", /* 8 */ };
-char *usbd_device_status[] = { +#define USBD_DEVICE_DESCRIPTORS(x) (((unsigned int)x <= USB_DESCRIPTOR_TYPE_INTERFACE_POWER) ? \ + usbd_device_descriptors[x] : "UNKNOWN") + +__maybe_unused static char *usbd_device_status[] = { "USBD_OPENING", "USBD_OK", "USBD_SUSPENDED", "USBD_CLOSING", };
+#define USBD_DEVICE_STATUS(x) (((unsigned int)x <= USBD_CLOSING) ? usbd_device_status[x] : "UNKNOWN") +
/* Descriptor support functions ************************************************************** */
diff --git a/drivers/usb/gadget/ep0.c b/drivers/usb/gadget/ep0.c index 6fabee24ce..2b15a508c5 100644 --- a/drivers/usb/gadget/ep0.c +++ b/drivers/usb/gadget/ep0.c @@ -46,6 +46,37 @@ #define dbg_ep0(lvl,fmt,args...) #endif
+__maybe_unused static char *usbd_device_states[] = { + "STATE_INIT", + "STATE_CREATED", + "STATE_ATTACHED", + "STATE_POWERED", + "STATE_DEFAULT", + "STATE_ADDRESSED", + "STATE_CONFIGURED", + "STATE_UNKNOWN", +}; + +#define USBD_DEVICE_STATE(x) (((unsigned int)x <= STATE_UNKNOWN) ? usbd_device_states[x] : "UNKNOWN") + +__maybe_unused static char *usbd_device_requests[] = { + "GET STATUS", /* 0 */ + "CLEAR FEATURE", /* 1 */ + "RESERVED", /* 2 */ + "SET FEATURE", /* 3 */ + "RESERVED", /* 4 */ + "SET ADDRESS", /* 5 */ + "GET DESCRIPTOR", /* 6 */ + "SET DESCRIPTOR", /* 7 */ + "GET CONFIGURATION", /* 8 */ + "SET CONFIGURATION", /* 9 */ + "GET INTERFACE", /* 10 */ + "SET INTERFACE", /* 11 */ + "SYNC FRAME", /* 12 */ +}; + +#define USBD_DEVICE_REQUESTS(x) (((unsigned int)x <= USB_REQ_SYNCH_FRAME) ? usbd_device_requests[x] : "UNKNOWN") + /* EP0 Configuration Set ********************************************************************* */
diff --git a/include/usbdevice.h b/include/usbdevice.h index f479724e37..611cd6e4ab 100644 --- a/include/usbdevice.h +++ b/include/usbdevice.h @@ -264,8 +264,6 @@ struct usb_bus_instance; #define USB_REQ_SET_INTERFACE 0x0B #define USB_REQ_SYNCH_FRAME 0x0C
-#define USBD_DEVICE_REQUESTS(x) (((unsigned int)x <= USB_REQ_SYNCH_FRAME) ? usbd_device_requests[x] : "UNKNOWN") - /* * HID requests */ @@ -332,9 +330,6 @@ struct usb_bus_instance; #define USB_DESCRIPTOR_TYPE_HID 0x21 #define USB_DESCRIPTOR_TYPE_REPORT 0x22
-#define USBD_DEVICE_DESCRIPTORS(x) (((unsigned int)x <= USB_DESCRIPTOR_TYPE_INTERFACE_POWER) ? \ - usbd_device_descriptors[x] : "UNKNOWN") - /* * standard feature selectors */ @@ -388,8 +383,6 @@ typedef enum usb_device_state { STATE_UNKNOWN, /* destroyed */ } usb_device_state_t;
-#define USBD_DEVICE_STATE(x) (((unsigned int)x <= STATE_UNKNOWN) ? usbd_device_states[x] : "UNKNOWN") - /* * Device status * @@ -402,8 +395,6 @@ typedef enum usb_device_status { USBD_CLOSING, /* we are currently closing */ } usb_device_status_t;
-#define USBD_DEVICE_STATUS(x) (((unsigned int)x <= USBD_CLOSING) ? usbd_device_status[x] : "UNKNOWN") - /* * Device Events * @@ -617,12 +608,6 @@ struct usb_bus_instance {
};
-extern char *usbd_device_events[]; -extern char *usbd_device_states[]; -extern char *usbd_device_status[]; -extern char *usbd_device_requests[]; -extern char *usbd_device_descriptors[]; - void urb_link_init (urb_link * ul); void urb_detach (struct urb *urb); urb_link *first_urb_link (urb_link * hd);
On Sun 2020-11-29 17:46:12, Pali Rohár wrote:
Each array is used only in one file (core.c or ep0.c). Move their content to correct file, mark them as static and do not export out of current file.
This change allows to decrease size of u-boot.bin as more of those strings are not used.
Signed-off-by: Pali Rohár pali@kernel.org
Reviewed-by: Pavel Machek pavel@ucw.cz
Each array is used only in one file (core.c or ep0.c). Move their content to correct file, mark them as static and do not export out of current file.
This change allows to decrease size of u-boot.bin as more of those strings are not used.
Signed-off-by: Pali Rohár pali@kernel.org
--- Changes in v2: * Move usbd_device_descriptors[] into ep0.c where it is used --- drivers/usb/gadget/core.c | 45 ++++---------------------------------- drivers/usb/gadget/ep0.c | 46 +++++++++++++++++++++++++++++++++++++++ include/usbdevice.h | 15 ------------- 3 files changed, 50 insertions(+), 56 deletions(-)
diff --git a/drivers/usb/gadget/core.c b/drivers/usb/gadget/core.c index 3781d25fd6..888f0cfea6 100644 --- a/drivers/usb/gadget/core.c +++ b/drivers/usb/gadget/core.c @@ -36,7 +36,7 @@ extern struct usb_function_driver ep0_driver; int registered_functions; int registered_devices;
-char *usbd_device_events[] = { +__maybe_unused static char *usbd_device_events[] = { "DEVICE_UNKNOWN", "DEVICE_INIT", "DEVICE_CREATE", @@ -56,52 +56,15 @@ char *usbd_device_events[] = { "DEVICE_FUNCTION_PRIVATE", };
-char *usbd_device_states[] = { - "STATE_INIT", - "STATE_CREATED", - "STATE_ATTACHED", - "STATE_POWERED", - "STATE_DEFAULT", - "STATE_ADDRESSED", - "STATE_CONFIGURED", - "STATE_UNKNOWN", -}; - -char *usbd_device_requests[] = { - "GET STATUS", /* 0 */ - "CLEAR FEATURE", /* 1 */ - "RESERVED", /* 2 */ - "SET FEATURE", /* 3 */ - "RESERVED", /* 4 */ - "SET ADDRESS", /* 5 */ - "GET DESCRIPTOR", /* 6 */ - "SET DESCRIPTOR", /* 7 */ - "GET CONFIGURATION", /* 8 */ - "SET CONFIGURATION", /* 9 */ - "GET INTERFACE", /* 10 */ - "SET INTERFACE", /* 11 */ - "SYNC FRAME", /* 12 */ -}; - -char *usbd_device_descriptors[] = { - "UNKNOWN", /* 0 */ - "DEVICE", /* 1 */ - "CONFIG", /* 2 */ - "STRING", /* 3 */ - "INTERFACE", /* 4 */ - "ENDPOINT", /* 5 */ - "DEVICE QUALIFIER", /* 6 */ - "OTHER SPEED", /* 7 */ - "INTERFACE POWER", /* 8 */ -}; - -char *usbd_device_status[] = { +__maybe_unused static char *usbd_device_status[] = { "USBD_OPENING", "USBD_OK", "USBD_SUSPENDED", "USBD_CLOSING", };
+#define USBD_DEVICE_STATUS(x) (((unsigned int)x <= USBD_CLOSING) ? usbd_device_status[x] : "UNKNOWN") +
/* Descriptor support functions ************************************************************** */
diff --git a/drivers/usb/gadget/ep0.c b/drivers/usb/gadget/ep0.c index 6fabee24ce..457679f0a4 100644 --- a/drivers/usb/gadget/ep0.c +++ b/drivers/usb/gadget/ep0.c @@ -46,6 +46,52 @@ #define dbg_ep0(lvl,fmt,args...) #endif
+__maybe_unused static char *usbd_device_descriptors[] = { + "UNKNOWN", /* 0 */ + "DEVICE", /* 1 */ + "CONFIG", /* 2 */ + "STRING", /* 3 */ + "INTERFACE", /* 4 */ + "ENDPOINT", /* 5 */ + "DEVICE QUALIFIER", /* 6 */ + "OTHER SPEED", /* 7 */ + "INTERFACE POWER", /* 8 */ +}; + +#define USBD_DEVICE_DESCRIPTORS(x) (((unsigned int)x <= USB_DESCRIPTOR_TYPE_INTERFACE_POWER) ? \ + usbd_device_descriptors[x] : "UNKNOWN") + +__maybe_unused static char *usbd_device_states[] = { + "STATE_INIT", + "STATE_CREATED", + "STATE_ATTACHED", + "STATE_POWERED", + "STATE_DEFAULT", + "STATE_ADDRESSED", + "STATE_CONFIGURED", + "STATE_UNKNOWN", +}; + +#define USBD_DEVICE_STATE(x) (((unsigned int)x <= STATE_UNKNOWN) ? usbd_device_states[x] : "UNKNOWN") + +__maybe_unused static char *usbd_device_requests[] = { + "GET STATUS", /* 0 */ + "CLEAR FEATURE", /* 1 */ + "RESERVED", /* 2 */ + "SET FEATURE", /* 3 */ + "RESERVED", /* 4 */ + "SET ADDRESS", /* 5 */ + "GET DESCRIPTOR", /* 6 */ + "SET DESCRIPTOR", /* 7 */ + "GET CONFIGURATION", /* 8 */ + "SET CONFIGURATION", /* 9 */ + "GET INTERFACE", /* 10 */ + "SET INTERFACE", /* 11 */ + "SYNC FRAME", /* 12 */ +}; + +#define USBD_DEVICE_REQUESTS(x) (((unsigned int)x <= USB_REQ_SYNCH_FRAME) ? usbd_device_requests[x] : "UNKNOWN") + /* EP0 Configuration Set ********************************************************************* */
diff --git a/include/usbdevice.h b/include/usbdevice.h index f479724e37..611cd6e4ab 100644 --- a/include/usbdevice.h +++ b/include/usbdevice.h @@ -264,8 +264,6 @@ struct usb_bus_instance; #define USB_REQ_SET_INTERFACE 0x0B #define USB_REQ_SYNCH_FRAME 0x0C
-#define USBD_DEVICE_REQUESTS(x) (((unsigned int)x <= USB_REQ_SYNCH_FRAME) ? usbd_device_requests[x] : "UNKNOWN") - /* * HID requests */ @@ -332,9 +330,6 @@ struct usb_bus_instance; #define USB_DESCRIPTOR_TYPE_HID 0x21 #define USB_DESCRIPTOR_TYPE_REPORT 0x22
-#define USBD_DEVICE_DESCRIPTORS(x) (((unsigned int)x <= USB_DESCRIPTOR_TYPE_INTERFACE_POWER) ? \ - usbd_device_descriptors[x] : "UNKNOWN") - /* * standard feature selectors */ @@ -388,8 +383,6 @@ typedef enum usb_device_state { STATE_UNKNOWN, /* destroyed */ } usb_device_state_t;
-#define USBD_DEVICE_STATE(x) (((unsigned int)x <= STATE_UNKNOWN) ? usbd_device_states[x] : "UNKNOWN") - /* * Device status * @@ -402,8 +395,6 @@ typedef enum usb_device_status { USBD_CLOSING, /* we are currently closing */ } usb_device_status_t;
-#define USBD_DEVICE_STATUS(x) (((unsigned int)x <= USBD_CLOSING) ? usbd_device_status[x] : "UNKNOWN") - /* * Device Events * @@ -617,12 +608,6 @@ struct usb_bus_instance {
};
-extern char *usbd_device_events[]; -extern char *usbd_device_states[]; -extern char *usbd_device_status[]; -extern char *usbd_device_requests[]; -extern char *usbd_device_descriptors[]; - void urb_link_init (urb_link * ul); void urb_detach (struct urb *urb); urb_link *first_urb_link (urb_link * hd);
All debug messages from ep0.c except a few are printed by dbg_ep0() macro. So for remaining few exception use also dbg_ep0() instead of serial_printf().
Signed-off-by: Pali Rohár pali@kernel.org --- drivers/usb/gadget/ep0.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/drivers/usb/gadget/ep0.c b/drivers/usb/gadget/ep0.c index 2b15a508c5..aafe2680aa 100644 --- a/drivers/usb/gadget/ep0.c +++ b/drivers/usb/gadget/ep0.c @@ -279,7 +279,7 @@ static int ep0_get_descriptor (struct usb_device_instance *device, { struct usb_string_descriptor *string_descriptor; if (!(string_descriptor = usbd_get_string (index))) { - serial_printf("Invalid string index %d\n", index); + dbg_ep0(0, "Invalid string index %d\n", index); return -1; } dbg_ep0(3, "string_descriptor: %p length %d", string_descriptor, string_descriptor->bLength); @@ -287,14 +287,14 @@ static int ep0_get_descriptor (struct usb_device_instance *device, } break; case USB_DESCRIPTOR_TYPE_INTERFACE: - serial_printf("USB_DESCRIPTOR_TYPE_INTERFACE - error not implemented\n"); + dbg_ep0(2, "USB_DESCRIPTOR_TYPE_INTERFACE - error not implemented\n"); return -1; case USB_DESCRIPTOR_TYPE_ENDPOINT: - serial_printf("USB_DESCRIPTOR_TYPE_ENDPOINT - error not implemented\n"); + dbg_ep0(2, "USB_DESCRIPTOR_TYPE_ENDPOINT - error not implemented\n"); return -1; case USB_DESCRIPTOR_TYPE_HID: { - serial_printf("USB_DESCRIPTOR_TYPE_HID - error not implemented\n"); + dbg_ep0(2, "USB_DESCRIPTOR_TYPE_HID - error not implemented\n"); return -1; /* unsupported at this time */ #if 0 int bNumInterface = @@ -323,7 +323,7 @@ static int ep0_get_descriptor (struct usb_device_instance *device, break; case USB_DESCRIPTOR_TYPE_REPORT: { - serial_printf("USB_DESCRIPTOR_TYPE_REPORT - error not implemented\n"); + dbg_ep0(2, "USB_DESCRIPTOR_TYPE_REPORT - error not implemented\n"); return -1; /* unsupported at this time */ #if 0 int bNumInterface = @@ -516,7 +516,7 @@ int ep0_recv_setup (struct urb *urb) le16_to_cpu (request->wValue) & 0xff);
case USB_REQ_GET_CONFIGURATION: - serial_printf("get config %d\n", device->configuration); + dbg_ep0(2, "get config %d\n", device->configuration); return ep0_get_one (device, urb, device->configuration);
@@ -606,14 +606,14 @@ int ep0_recv_setup (struct urb *urb) device->interface = device->alternate = 0;
/*dbg_ep0(2, "set configuration: %d", device->configuration); */ - /*serial_printf("DEVICE_CONFIGURED.. event?\n"); */ + /*dbg_ep0(2, "DEVICE_CONFIGURED.. event?\n"); */ return 0;
case USB_REQ_SET_INTERFACE: device->interface = le16_to_cpu (request->wIndex); device->alternate = le16_to_cpu (request->wValue); /*dbg_ep0(2, "set interface: %d alternate: %d", device->interface, device->alternate); */ - serial_printf("DEVICE_SET_INTERFACE.. event?\n"); + dbg_ep0(2, "DEVICE_SET_INTERFACE.. event?\n"); return 0;
case USB_REQ_GET_STATUS:
On Sun 2020-11-29 17:49:52, Pali Rohár wrote:
All debug messages from ep0.c except a few are printed by dbg_ep0() macro. So for remaining few exception use also dbg_ep0() instead of serial_printf().
Signed-off-by: Pali Rohár pali@kernel.org
Reviewed-by: Pavel Machek pavel@ucw.cz
Function lowlevel_init() is called only from cpu_init_crit() and this function is wrapped into #if .. #endif section. So compile also lowlevel_init() function under same #if condition.
Signed-off-by: Pali Rohár pali@kernel.org --- arch/arm/mach-omap2/omap3/lowlevel_init.S | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/arch/arm/mach-omap2/omap3/lowlevel_init.S b/arch/arm/mach-omap2/omap3/lowlevel_init.S index 2a05b5e521..4fa89418a1 100644 --- a/arch/arm/mach-omap2/omap3/lowlevel_init.S +++ b/arch/arm/mach-omap2/omap3/lowlevel_init.S @@ -45,7 +45,7 @@ ENDPROC(do_omap3_emu_romcode_call) ENTRY(cpy_clk_code) /* Copy DPLL code into SRAM */ adr r0, go_to_speed /* copy from start of go_to_speed... */ - adr r2, lowlevel_init /* ... up to start of low_level_init */ + adr r2, go_to_speed_end /* ... up to start of go_to_speed_end */ next2: ldmia r0!, {r3 - r10} /* copy from source address [r0] */ stmia r1!, {r3 - r10} /* copy to target address [r1] */ @@ -167,8 +167,11 @@ pll_div_add5: pll_div_val5: .word CLSEL1_EMU_VAL
+go_to_speed_end: #endif
+#if !defined(CONFIG_SKIP_LOWLEVEL_INIT) && \ + !defined(CONFIG_SKIP_LOWLEVEL_INIT_ONLY) ENTRY(lowlevel_init) ldr sp, SRAM_STACK str ip, [sp] /* stash ip register */ @@ -187,6 +190,7 @@ ENTRY(lowlevel_init) b s_init
ENDPROC(lowlevel_init) +#endif
/* the literal pools origin */ .ltorg
On Sun 2020-11-29 17:51:38, Pali Rohár wrote:
Function lowlevel_init() is called only from cpu_init_crit() and this function is wrapped into #if .. #endif section. So compile also lowlevel_init() function under same #if condition.
Signed-off-by: Pali Rohár pali@kernel.org
Reviewed-by: Pavel Machek pavel@ucw.cz
Function s_init() is called only from lowlevel_init(). So compile it only when function lowlevel_init() is compiled.
Signed-off-by: Pali Rohár pali@kernel.org --- arch/arm/mach-omap2/omap3/board.c | 3 +++ 1 file changed, 3 insertions(+)
diff --git a/arch/arm/mach-omap2/omap3/board.c b/arch/arm/mach-omap2/omap3/board.c index f08c8ab43a..9ea219fafc 100644 --- a/arch/arm/mach-omap2/omap3/board.c +++ b/arch/arm/mach-omap2/omap3/board.c @@ -179,6 +179,8 @@ void early_system_init(void) hw_data_init(); }
+#if !defined(CONFIG_SKIP_LOWLEVEL_INIT) && \ + !defined(CONFIG_SKIP_LOWLEVEL_INIT_ONLY) /****************************************************************************** * Routine: s_init * Description: Does early system init of muxing and clocks. @@ -207,6 +209,7 @@ void s_init(void) ehci_clocks_enable(); #endif } +#endif
#ifdef CONFIG_SPL_BUILD void board_init_f(ulong dummy)
On Sun 2020-11-29 17:52:07, Pali Rohár wrote:
Function s_init() is called only from lowlevel_init(). So compile it only when function lowlevel_init() is compiled.
Signed-off-by: Pali Rohár pali@kernel.org
Reviewed-by: Pavel Machek pavel@ucw.cz
This function is not used and was never called.
This board contains '#define CONFIG_SKIP_LOWLEVEL_INIT' because X-Loader set everything up, including MUX configuration.
Also this MUX configuration is incorrect and does not match hardware.
So remove this dead, unused and broken code.
This change will decrease size of U-Boot binary.
Signed-off-by: Pali Rohár pali@kernel.org --- board/nokia/rx51/rx51.c | 11 -- board/nokia/rx51/rx51.h | 346 ---------------------------------------- 2 files changed, 357 deletions(-)
diff --git a/board/nokia/rx51/rx51.c b/board/nokia/rx51/rx51.c index 7390e5be65..78edd2145c 100644 --- a/board/nokia/rx51/rx51.c +++ b/board/nokia/rx51/rx51.c @@ -467,17 +467,6 @@ int misc_init_r(void) return 0; }
-/* - * Routine: set_muxconf_regs - * Description: Setting up the configuration Mux registers specific to the - * hardware. Many pins need to be moved from protect to primary - * mode. - */ -void set_muxconf_regs(void) -{ - MUX_RX51(); -} - static unsigned long int twl_wd_time; /* last time of watchdog reset */ static unsigned long int twl_i2c_lock;
diff --git a/board/nokia/rx51/rx51.h b/board/nokia/rx51/rx51.h index 4eff823a1b..0eddb06219 100644 --- a/board/nokia/rx51/rx51.h +++ b/board/nokia/rx51/rx51.h @@ -21,352 +21,6 @@ struct emu_hal_params_rx51 { u32 param4; };
-/* - * IEN - Input Enable - * IDIS - Input Disable - * PTD - Pull type Down - * PTU - Pull type Up - * DIS - Pull type selection is inactive - * EN - Pull type selection is active - * M0 - Mode 0 - * The commented string gives the final mux configuration for that pin - */ -#define MUX_RX51() \ -/* SDRC */\ - MUX_VAL(CP(SDRC_D0), (IEN | PTD | DIS | M0)) /*SDRC_D0*/\ - MUX_VAL(CP(SDRC_D1), (IEN | PTD | DIS | M0)) /*SDRC_D1*/\ - MUX_VAL(CP(SDRC_D2), (IEN | PTD | DIS | M0)) /*SDRC_D2*/\ - MUX_VAL(CP(SDRC_D3), (IEN | PTD | DIS | M0)) /*SDRC_D3*/\ - MUX_VAL(CP(SDRC_D4), (IEN | PTD | DIS | M0)) /*SDRC_D4*/\ - MUX_VAL(CP(SDRC_D5), (IEN | PTD | DIS | M0)) /*SDRC_D5*/\ - MUX_VAL(CP(SDRC_D6), (IEN | PTD | DIS | M0)) /*SDRC_D6*/\ - MUX_VAL(CP(SDRC_D7), (IEN | PTD | DIS | M0)) /*SDRC_D7*/\ - MUX_VAL(CP(SDRC_D8), (IEN | PTD | DIS | M0)) /*SDRC_D8*/\ - MUX_VAL(CP(SDRC_D9), (IEN | PTD | DIS | M0)) /*SDRC_D9*/\ - MUX_VAL(CP(SDRC_D10), (IEN | PTD | DIS | M0)) /*SDRC_D10*/\ - MUX_VAL(CP(SDRC_D11), (IEN | PTD | DIS | M0)) /*SDRC_D11*/\ - MUX_VAL(CP(SDRC_D12), (IEN | PTD | DIS | M0)) /*SDRC_D12*/\ - MUX_VAL(CP(SDRC_D13), (IEN | PTD | DIS | M0)) /*SDRC_D13*/\ - MUX_VAL(CP(SDRC_D14), (IEN | PTD | DIS | M0)) /*SDRC_D14*/\ - MUX_VAL(CP(SDRC_D15), (IEN | PTD | DIS | M0)) /*SDRC_D15*/\ - MUX_VAL(CP(SDRC_D16), (IEN | PTD | DIS | M0)) /*SDRC_D16*/\ - MUX_VAL(CP(SDRC_D17), (IEN | PTD | DIS | M0)) /*SDRC_D17*/\ - MUX_VAL(CP(SDRC_D18), (IEN | PTD | DIS | M0)) /*SDRC_D18*/\ - MUX_VAL(CP(SDRC_D19), (IEN | PTD | DIS | M0)) /*SDRC_D19*/\ - MUX_VAL(CP(SDRC_D20), (IEN | PTD | DIS | M0)) /*SDRC_D20*/\ - MUX_VAL(CP(SDRC_D21), (IEN | PTD | DIS | M0)) /*SDRC_D21*/\ - MUX_VAL(CP(SDRC_D22), (IEN | PTD | DIS | M0)) /*SDRC_D22*/\ - MUX_VAL(CP(SDRC_D23), (IEN | PTD | DIS | M0)) /*SDRC_D23*/\ - MUX_VAL(CP(SDRC_D24), (IEN | PTD | DIS | M0)) /*SDRC_D24*/\ - MUX_VAL(CP(SDRC_D25), (IEN | PTD | DIS | M0)) /*SDRC_D25*/\ - MUX_VAL(CP(SDRC_D26), (IEN | PTD | DIS | M0)) /*SDRC_D26*/\ - MUX_VAL(CP(SDRC_D27), (IEN | PTD | DIS | M0)) /*SDRC_D27*/\ - MUX_VAL(CP(SDRC_D28), (IEN | PTD | DIS | M0)) /*SDRC_D28*/\ - MUX_VAL(CP(SDRC_D29), (IEN | PTD | DIS | M0)) /*SDRC_D29*/\ - MUX_VAL(CP(SDRC_D30), (IEN | PTD | DIS | M0)) /*SDRC_D30*/\ - MUX_VAL(CP(SDRC_D31), (IEN | PTD | DIS | M0)) /*SDRC_D31*/\ - MUX_VAL(CP(SDRC_CLK), (IEN | PTD | DIS | M0)) /*SDRC_CLK*/\ - MUX_VAL(CP(SDRC_DQS0), (IEN | PTD | DIS | M0)) /*SDRC_DQS0*/\ - MUX_VAL(CP(SDRC_DQS1), (IEN | PTD | DIS | M0)) /*SDRC_DQS1*/\ - MUX_VAL(CP(SDRC_DQS2), (IEN | PTD | DIS | M0)) /*SDRC_DQS2*/\ - MUX_VAL(CP(SDRC_DQS3), (IEN | PTD | DIS | M0)) /*SDRC_DQS3*/\ -/* GPMC */\ - MUX_VAL(CP(GPMC_A1), (IDIS | PTD | DIS | M0)) /*GPMC_A1*/\ - MUX_VAL(CP(GPMC_A2), (IDIS | PTD | DIS | M0)) /*GPMC_A2*/\ - MUX_VAL(CP(GPMC_A3), (IDIS | PTD | DIS | M0)) /*GPMC_A3*/\ - MUX_VAL(CP(GPMC_A4), (IDIS | PTD | DIS | M0)) /*GPMC_A4*/\ - MUX_VAL(CP(GPMC_A5), (IDIS | PTD | DIS | M0)) /*GPMC_A5*/\ - MUX_VAL(CP(GPMC_A6), (IDIS | PTD | DIS | M0)) /*GPMC_A6*/\ - MUX_VAL(CP(GPMC_A7), (IDIS | PTD | DIS | M0)) /*GPMC_A7*/\ - MUX_VAL(CP(GPMC_A8), (IDIS | PTD | DIS | M0)) /*GPMC_A8*/\ - MUX_VAL(CP(GPMC_A9), (IDIS | PTD | DIS | M0)) /*GPMC_A9*/\ - MUX_VAL(CP(GPMC_A10), (IDIS | PTD | DIS | M0)) /*GPMC_A10*/\ - MUX_VAL(CP(GPMC_D0), (IEN | PTD | DIS | M0)) /*GPMC_D0*/\ - MUX_VAL(CP(GPMC_D1), (IEN | PTD | DIS | M0)) /*GPMC_D1*/\ - MUX_VAL(CP(GPMC_D2), (IEN | PTD | DIS | M0)) /*GPMC_D2*/\ - MUX_VAL(CP(GPMC_D3), (IEN | PTD | DIS | M0)) /*GPMC_D3*/\ - MUX_VAL(CP(GPMC_D4), (IEN | PTD | DIS | M0)) /*GPMC_D4*/\ - MUX_VAL(CP(GPMC_D5), (IEN | PTD | DIS | M0)) /*GPMC_D5*/\ - MUX_VAL(CP(GPMC_D6), (IEN | PTD | DIS | M0)) /*GPMC_D6*/\ - MUX_VAL(CP(GPMC_D7), (IEN | PTD | DIS | M0)) /*GPMC_D7*/\ - MUX_VAL(CP(GPMC_D8), (IEN | PTD | DIS | M0)) /*GPMC_D8*/\ - MUX_VAL(CP(GPMC_D9), (IEN | PTD | DIS | M0)) /*GPMC_D9*/\ - MUX_VAL(CP(GPMC_D10), (IEN | PTD | DIS | M0)) /*GPMC_D10*/\ - MUX_VAL(CP(GPMC_D11), (IEN | PTD | DIS | M0)) /*GPMC_D11*/\ - MUX_VAL(CP(GPMC_D12), (IEN | PTD | DIS | M0)) /*GPMC_D12*/\ - MUX_VAL(CP(GPMC_D13), (IEN | PTD | DIS | M0)) /*GPMC_D13*/\ - MUX_VAL(CP(GPMC_D14), (IEN | PTD | DIS | M0)) /*GPMC_D14*/\ - MUX_VAL(CP(GPMC_D15), (IEN | PTD | DIS | M0)) /*GPMC_D15*/\ - MUX_VAL(CP(GPMC_NCS0), (IDIS | PTU | EN | M0)) /*GPMC_nCS0*/\ - MUX_VAL(CP(GPMC_NCS1), (IDIS | PTU | EN | M0)) /*GPMC_nCS1*/\ - MUX_VAL(CP(GPMC_NCS2), (IDIS | PTU | EN | M0)) /*GPMC_nCS2*/\ - MUX_VAL(CP(GPMC_NCS3), (IDIS | PTU | EN | M0)) /*GPMC_nCS3*/\ - MUX_VAL(CP(GPMC_NCS4), (IDIS | PTU | EN | M0)) /*GPMC_nCS4*/\ - MUX_VAL(CP(GPMC_NCS5), (IDIS | PTD | DIS | M0)) /*GPMC_nCS5*/\ - MUX_VAL(CP(GPMC_NCS6), (IEN | PTD | DIS | M1)) /*nDMA_REQ2*/\ - MUX_VAL(CP(GPMC_NCS7), (IEN | PTU | EN | M1)) /*nDMA_REQ3*/\ - MUX_VAL(CP(GPMC_NBE1), (IEN | PTD | DIS | M0)) /*GPMC_nBE1*/\ - MUX_VAL(CP(GPMC_WAIT2), (IEN | PTU | EN | M0)) /*GPMC_WAIT2*/\ - MUX_VAL(CP(GPMC_WAIT3), (IEN | PTU | EN | M0)) /*GPMC_WAIT3*/\ - MUX_VAL(CP(GPMC_CLK), (IDIS | PTD | DIS | M0)) /*GPMC_CLK*/\ - MUX_VAL(CP(GPMC_NADV_ALE), (IDIS | PTD | DIS | M0)) /*GPMC_nADV*/\ - MUX_VAL(CP(GPMC_NOE), (IDIS | PTD | DIS | M0)) /*GPMC_nOE*/\ - MUX_VAL(CP(GPMC_NWE), (IDIS | PTD | DIS | M0)) /*GPMC_nWE*/\ - MUX_VAL(CP(GPMC_NBE0_CLE), (IDIS | PTD | DIS | M0)) /*GPMC_nBE0*/\ - MUX_VAL(CP(GPMC_NWP), (IEN | PTD | DIS | M0)) /*GPMC_nWP*/\ - MUX_VAL(CP(GPMC_WAIT0), (IEN | PTU | EN | M0)) /*GPMC_WAIT0*/\ - MUX_VAL(CP(GPMC_WAIT1), (IEN | PTU | EN | M0)) /*GPMC_WAIT1*/\ -/* DSS */\ - MUX_VAL(CP(DSS_PCLK), (IDIS | PTD | DIS | M0)) /*DSS_PCLK*/\ - MUX_VAL(CP(DSS_HSYNC), (IDIS | PTD | DIS | M0)) /*DSS_HSYNC*/\ - MUX_VAL(CP(DSS_VSYNC), (IDIS | PTD | DIS | M0)) /*DSS_VSYNC*/\ - MUX_VAL(CP(DSS_ACBIAS), (IDIS | PTD | DIS | M0)) /*DSS_ACBIAS*/\ - MUX_VAL(CP(DSS_DATA0), (IDIS | PTD | DIS | M0)) /*DSS_DATA0*/\ - MUX_VAL(CP(DSS_DATA1), (IDIS | PTD | DIS | M0)) /*DSS_DATA1*/\ - MUX_VAL(CP(DSS_DATA2), (IDIS | PTD | DIS | M0)) /*DSS_DATA2*/\ - MUX_VAL(CP(DSS_DATA3), (IDIS | PTD | DIS | M0)) /*DSS_DATA3*/\ - MUX_VAL(CP(DSS_DATA4), (IDIS | PTD | DIS | M0)) /*DSS_DATA4*/\ - MUX_VAL(CP(DSS_DATA5), (IDIS | PTD | DIS | M0)) /*DSS_DATA5*/\ - MUX_VAL(CP(DSS_DATA6), (IDIS | PTD | DIS | M0)) /*DSS_DATA6*/\ - MUX_VAL(CP(DSS_DATA7), (IDIS | PTD | DIS | M0)) /*DSS_DATA7*/\ - MUX_VAL(CP(DSS_DATA8), (IDIS | PTD | DIS | M0)) /*DSS_DATA8*/\ - MUX_VAL(CP(DSS_DATA9), (IDIS | PTD | DIS | M0)) /*DSS_DATA9*/\ - MUX_VAL(CP(DSS_DATA10), (IDIS | PTD | DIS | M0)) /*DSS_DATA10*/\ - MUX_VAL(CP(DSS_DATA11), (IDIS | PTD | DIS | M0)) /*DSS_DATA11*/\ - MUX_VAL(CP(DSS_DATA12), (IDIS | PTD | DIS | M0)) /*DSS_DATA12*/\ - MUX_VAL(CP(DSS_DATA13), (IDIS | PTD | DIS | M0)) /*DSS_DATA13*/\ - MUX_VAL(CP(DSS_DATA14), (IDIS | PTD | DIS | M0)) /*DSS_DATA14*/\ - MUX_VAL(CP(DSS_DATA15), (IDIS | PTD | DIS | M0)) /*DSS_DATA15*/\ - MUX_VAL(CP(DSS_DATA16), (IDIS | PTD | DIS | M0)) /*DSS_DATA16*/\ - MUX_VAL(CP(DSS_DATA17), (IDIS | PTD | DIS | M0)) /*DSS_DATA17*/\ - MUX_VAL(CP(DSS_DATA18), (IDIS | PTD | DIS | M0)) /*DSS_DATA18*/\ - MUX_VAL(CP(DSS_DATA19), (IDIS | PTD | DIS | M0)) /*DSS_DATA19*/\ - MUX_VAL(CP(DSS_DATA20), (IDIS | PTD | DIS | M0)) /*DSS_DATA20*/\ - MUX_VAL(CP(DSS_DATA21), (IDIS | PTD | DIS | M0)) /*DSS_DATA21*/\ - MUX_VAL(CP(DSS_DATA22), (IDIS | PTD | DIS | M0)) /*DSS_DATA22*/\ - MUX_VAL(CP(DSS_DATA23), (IDIS | PTD | DIS | M0)) /*DSS_DATA23*/\ -/* CAMERA */\ - MUX_VAL(CP(CAM_HS), (IEN | PTU | EN | M0)) /*CAM_HS*/\ - MUX_VAL(CP(CAM_VS), (IEN | PTU | EN | M0)) /*CAM_VS*/\ - MUX_VAL(CP(CAM_XCLKA), (IDIS | PTD | DIS | M0)) /*CAM_XCLKA*/\ - MUX_VAL(CP(CAM_PCLK), (IEN | PTU | EN | M0)) /*CAM_PCLK*/\ - MUX_VAL(CP(CAM_FLD), (IDIS | PTD | DIS | M4)) /*GPIO_98*/\ - MUX_VAL(CP(CAM_D0), (IEN | PTD | DIS | M0)) /*CAM_D0*/\ - MUX_VAL(CP(CAM_D1), (IEN | PTD | DIS | M0)) /*CAM_D1*/\ - MUX_VAL(CP(CAM_D2), (IEN | PTD | DIS | M0)) /*CAM_D2*/\ - MUX_VAL(CP(CAM_D3), (IEN | PTD | DIS | M0)) /*CAM_D3*/\ - MUX_VAL(CP(CAM_D4), (IEN | PTD | DIS | M0)) /*CAM_D4*/\ - MUX_VAL(CP(CAM_D5), (IEN | PTD | DIS | M0)) /*CAM_D5*/\ - MUX_VAL(CP(CAM_D6), (IEN | PTD | DIS | M0)) /*CAM_D6*/\ - MUX_VAL(CP(CAM_D7), (IEN | PTD | DIS | M0)) /*CAM_D7*/\ - MUX_VAL(CP(CAM_D8), (IEN | PTD | DIS | M0)) /*CAM_D8*/\ - MUX_VAL(CP(CAM_D9), (IEN | PTD | DIS | M0)) /*CAM_D9*/\ - MUX_VAL(CP(CAM_D10), (IEN | PTD | DIS | M0)) /*CAM_D10*/\ - MUX_VAL(CP(CAM_D11), (IEN | PTD | DIS | M0)) /*CAM_D11*/\ - MUX_VAL(CP(CAM_XCLKB), (IDIS | PTD | DIS | M0)) /*CAM_XCLKB*/\ - MUX_VAL(CP(CAM_WEN), (IEN | PTD | DIS | M4)) /*GPIO_167*/\ - MUX_VAL(CP(CAM_STROBE), (IDIS | PTD | DIS | M0)) /*CAM_STROBE*/\ - MUX_VAL(CP(CSI2_DX0), (IEN | PTD | DIS | M0)) /*CSI2_DX0*/\ - MUX_VAL(CP(CSI2_DY0), (IEN | PTD | DIS | M0)) /*CSI2_DY0*/\ - MUX_VAL(CP(CSI2_DX1), (IEN | PTD | DIS | M0)) /*CSI2_DX1*/\ - MUX_VAL(CP(CSI2_DY1), (IEN | PTD | DIS | M0)) /*CSI2_DY1*/\ -/* Audio Interface */\ - MUX_VAL(CP(MCBSP2_FSX), (IEN | PTD | DIS | M0)) /*McBSP2_FSX*/\ - MUX_VAL(CP(MCBSP2_CLKX), (IEN | PTD | DIS | M0)) /*McBSP2_CLK*/\ - MUX_VAL(CP(MCBSP2_DR), (IEN | PTD | DIS | M0)) /*McBSP2_DR*/\ - MUX_VAL(CP(MCBSP2_DX), (IDIS | PTD | DIS | M0)) /*McBSP2_DX*/\ -/* Expansion card */\ - MUX_VAL(CP(MMC1_CLK), (IDIS | PTU | EN | M0)) /*MMC1_CLK*/\ - MUX_VAL(CP(MMC1_CMD), (IEN | PTU | EN | M0)) /*MMC1_CMD*/\ - MUX_VAL(CP(MMC1_DAT0), (IEN | PTU | EN | M0)) /*MMC1_DAT0*/\ - MUX_VAL(CP(MMC1_DAT1), (IEN | PTU | EN | M0)) /*MMC1_DAT1*/\ - MUX_VAL(CP(MMC1_DAT2), (IEN | PTU | EN | M0)) /*MMC1_DAT2*/\ - MUX_VAL(CP(MMC1_DAT3), (IEN | PTU | EN | M0)) /*MMC1_DAT3*/\ - MUX_VAL(CP(MMC1_DAT4), (IEN | PTU | EN | M0)) /*MMC1_DAT4*/\ - MUX_VAL(CP(MMC1_DAT5), (IEN | PTU | EN | M0)) /*MMC1_DAT5*/\ - MUX_VAL(CP(MMC1_DAT6), (IEN | PTU | EN | M0)) /*MMC1_DAT6*/\ - MUX_VAL(CP(MMC1_DAT7), (IEN | PTU | EN | M0)) /*MMC1_DAT7*/\ -/* Wireless LAN */\ - MUX_VAL(CP(MMC2_CLK), (IEN | PTU | EN | M4)) /*GPIO_130*/\ - MUX_VAL(CP(MMC2_CMD), (IEN | PTU | EN | M4)) /*GPIO_131*/\ - MUX_VAL(CP(MMC2_DAT0), (IEN | PTU | EN | M4)) /*GPIO_132*/\ - MUX_VAL(CP(MMC2_DAT1), (IEN | PTU | EN | M4)) /*GPIO_133*/\ - MUX_VAL(CP(MMC2_DAT2), (IEN | PTU | EN | M4)) /*GPIO_134*/\ - MUX_VAL(CP(MMC2_DAT3), (IEN | PTU | EN | M4)) /*GPIO_135*/\ - MUX_VAL(CP(MMC2_DAT4), (IEN | PTU | EN | M4)) /*GPIO_136*/\ - MUX_VAL(CP(MMC2_DAT5), (IEN | PTU | EN | M4)) /*GPIO_137*/\ - MUX_VAL(CP(MMC2_DAT6), (IEN | PTU | EN | M4)) /*GPIO_138*/\ - MUX_VAL(CP(MMC2_DAT7), (IEN | PTU | EN | M4)) /*GPIO_139*/\ -/* Bluetooth */\ - MUX_VAL(CP(MCBSP3_DX), (IEN | PTD | DIS | M1)) /*UART2_CTS*/\ - MUX_VAL(CP(MCBSP3_DR), (IDIS | PTD | DIS | M1)) /*UART2_RTS*/\ - MUX_VAL(CP(MCBSP3_CLKX), (IDIS | PTD | DIS | M1)) /*UART2_TX*/\ - MUX_VAL(CP(MCBSP3_FSX), (IEN | PTD | DIS | M1)) /*UART2_RX*/\ - MUX_VAL(CP(UART2_CTS), (IEN | PTD | DIS | M4)) /*GPIO_144*/\ - MUX_VAL(CP(UART2_RTS), (IEN | PTD | DIS | M4)) /*GPIO_145*/\ - MUX_VAL(CP(UART2_TX), (IEN | PTD | DIS | M4)) /*GPIO_146*/\ - MUX_VAL(CP(UART2_RX), (IEN | PTD | DIS | M4)) /*GPIO_147*/\ -/* Modem Interface */\ - MUX_VAL(CP(UART1_TX), (IDIS | PTD | DIS | M0)) /*UART1_TX*/\ - MUX_VAL(CP(UART1_RTS), (IDIS | PTD | DIS | M4)) /*GPIO_149*/\ - MUX_VAL(CP(UART1_CTS), (IDIS | PTD | DIS | M4)) /*GPIO_150*/\ - MUX_VAL(CP(UART1_RX), (IEN | PTD | DIS | M0)) /*UART1_RX*/\ - MUX_VAL(CP(MCBSP4_CLKX), (IEN | PTD | DIS | M1)) /*SSI1_DAT*/\ - MUX_VAL(CP(MCBSP4_DR), (IEN | PTD | DIS | M1)) /*SSI1_FLAG*/\ - MUX_VAL(CP(MCBSP4_DX), (IEN | PTD | DIS | M1)) /*SSI1_RDY*/\ - MUX_VAL(CP(MCBSP4_FSX), (IEN | PTD | DIS | M1)) /*SSI1_WAKE*/\ - MUX_VAL(CP(MCBSP1_CLKR), (IDIS | PTD | DIS | M4)) /*GPIO_156*/\ - MUX_VAL(CP(MCBSP1_FSR), (IDIS | PTU | EN | M4)) /*GPIO_157*/\ - MUX_VAL(CP(MCBSP1_DX), (IDIS | PTD | DIS | M4)) /*GPIO_158*/\ - MUX_VAL(CP(MCBSP1_DR), (IDIS | PTD | DIS | M4)) /*GPIO_159*/\ - MUX_VAL(CP(MCBSP_CLKS), (IEN | PTU | DIS | M0)) /*McBSP_CLKS*/\ - MUX_VAL(CP(MCBSP1_FSX), (IDIS | PTD | DIS | M4)) /*GPIO_161*/\ - MUX_VAL(CP(MCBSP1_CLKX), (IDIS | PTD | DIS | M4)) /*GPIO_162*/\ -/* Serial Interface */\ - MUX_VAL(CP(UART3_CTS_RCTX), (IEN | PTD | EN | M0)) /*UART3_CTS*/\ - MUX_VAL(CP(UART3_RTS_SD), (IDIS | PTD | DIS | M0)) /*UART3_RTS*/\ - MUX_VAL(CP(UART3_RX_IRRX), (IEN | PTD | DIS | M0)) /*UART3_RX*/\ - MUX_VAL(CP(UART3_TX_IRTX), (IDIS | PTD | DIS | M0)) /*UART3_TX*/\ - MUX_VAL(CP(HSUSB0_CLK), (IEN | PTD | DIS | M0)) /*HSUSB0_CLK*/\ - MUX_VAL(CP(HSUSB0_STP), (IDIS | PTU | EN | M0)) /*HSUSB0_STP*/\ - MUX_VAL(CP(HSUSB0_DIR), (IEN | PTD | DIS | M0)) /*HSUSB0_DIR*/\ - MUX_VAL(CP(HSUSB0_NXT), (IEN | PTD | DIS | M0)) /*HSUSB0_NXT*/\ - MUX_VAL(CP(HSUSB0_DATA0), (IEN | PTD | DIS | M0)) /*HSUSB0_DA0*/\ - MUX_VAL(CP(HSUSB0_DATA1), (IEN | PTD | DIS | M0)) /*HSUSB0_DA1*/\ - MUX_VAL(CP(HSUSB0_DATA2), (IEN | PTD | DIS | M0)) /*HSUSB0_DA2*/\ - MUX_VAL(CP(HSUSB0_DATA3), (IEN | PTD | DIS | M0)) /*HSUSB0_DA3*/\ - MUX_VAL(CP(HSUSB0_DATA4), (IEN | PTD | DIS | M0)) /*HSUSB0_DA4*/\ - MUX_VAL(CP(HSUSB0_DATA5), (IEN | PTD | DIS | M0)) /*HSUSB0_DA5*/\ - MUX_VAL(CP(HSUSB0_DATA6), (IEN | PTD | DIS | M0)) /*HSUSB0_DA6*/\ - MUX_VAL(CP(HSUSB0_DATA7), (IEN | PTD | DIS | M0)) /*HSUSB0_DA7*/\ - MUX_VAL(CP(I2C1_SCL), (IEN | PTU | EN | M0)) /*I2C1_SCL*/\ - MUX_VAL(CP(I2C1_SDA), (IEN | PTU | EN | M0)) /*I2C1_SDA*/\ - MUX_VAL(CP(I2C2_SCL), (IEN | PTU | EN | M4)) /*GPIO_168*/\ - MUX_VAL(CP(I2C2_SDA), (IEN | PTU | EN | M4)) /*GPIO_183*/\ - MUX_VAL(CP(I2C3_SCL), (IEN | PTU | EN | M0)) /*I2C3_SCL*/\ - MUX_VAL(CP(I2C3_SDA), (IEN | PTU | EN | M0)) /*I2C3_SDA*/\ - MUX_VAL(CP(I2C4_SCL), (IEN | PTU | EN | M0)) /*I2C4_SCL*/\ - MUX_VAL(CP(I2C4_SDA), (IEN | PTU | EN | M0)) /*I2C4_SDA*/\ - MUX_VAL(CP(HDQ_SIO), (IDIS | PTU | EN | M4)) /*GPIO_170*/\ - MUX_VAL(CP(MCSPI1_CLK), (IEN | PTU | EN | M4)) /*GPIO_171*/\ - MUX_VAL(CP(MCSPI1_SIMO), (IEN | PTU | EN | M4)) /*GPIO_172*/\ - MUX_VAL(CP(MCSPI1_SOMI), (IEN | PTD | DIS | M0)) /*McSPI1_SOM*/\ - MUX_VAL(CP(MCSPI1_CS0), (IEN | PTD | EN | M0)) /*McSPI1_CS0*/\ - MUX_VAL(CP(MCSPI1_CS1), (IDIS | PTD | EN | M0)) /*McSPI1_CS1*/\ - MUX_VAL(CP(MCSPI1_CS2), (IDIS | PTD | DIS | M4)) /*GPIO_176*/\ -/* USB EHCI (port 2) */\ - MUX_VAL(CP(MCSPI1_CS3), (IEN | PTU | DIS | M3)) /*HSUSB2_DA2*/\ - MUX_VAL(CP(MCSPI2_CLK), (IEN | PTU | DIS | M3)) /*HSUSB2_DA7*/\ - MUX_VAL(CP(MCSPI2_SIMO), (IEN | PTU | DIS | M3)) /*HSUSB2_DA4*/\ - MUX_VAL(CP(MCSPI2_SOMI), (IEN | PTU | DIS | M3)) /*HSUSB2_DA5*/\ - MUX_VAL(CP(MCSPI2_CS0), (IEN | PTU | DIS | M3)) /*HSUSB2_DA6*/\ - MUX_VAL(CP(MCSPI2_CS1), (IEN | PTU | DIS | M3)) /*HSUSB2_DA3*/\ - MUX_VAL(CP(ETK_D10_ES2), (IDIS | PTU | DIS | M3)) /*HSUSB2_CLK*/\ - MUX_VAL(CP(ETK_D11_ES2), (IDIS | PTU | DIS | M3)) /*HSUSB2_STP*/\ - MUX_VAL(CP(ETK_D12_ES2), (IEN | PTU | DIS | M3)) /*HSUSB2_DIR*/\ - MUX_VAL(CP(ETK_D13_ES2), (IEN | PTU | DIS | M3)) /*HSUSB2_NXT*/\ - MUX_VAL(CP(ETK_D14_ES2), (IEN | PTU | DIS | M3)) /*HSUSB2_DA0*/\ - MUX_VAL(CP(ETK_D15_ES2), (IEN | PTU | DIS | M3)) /*HSUSB2_DA1*/\ -/* Control and debug */\ - MUX_VAL(CP(SYS_32K), (IEN | PTD | DIS | M0)) /*SYS_32K*/\ - MUX_VAL(CP(SYS_CLKREQ), (IEN | PTD | DIS | M0)) /*SYS_CLKREQ*/\ - MUX_VAL(CP(SYS_NIRQ), (IEN | PTU | EN | M0)) /*SYS_nIRQ*/\ - MUX_VAL(CP(SYS_BOOT0), (IEN | PTD | DIS | M4)) /*GPIO_2*/\ - MUX_VAL(CP(SYS_BOOT1), (IEN | PTD | DIS | M4)) /*GPIO_3*/\ - MUX_VAL(CP(SYS_BOOT2), (IEN | PTD | DIS | M4)) /*MMC1_WP*/\ - MUX_VAL(CP(SYS_BOOT3), (IEN | PTD | DIS | M4)) /*GPIO_5*/\ - MUX_VAL(CP(SYS_BOOT4), (IEN | PTD | DIS | M4)) /*GPIO_6*/\ - MUX_VAL(CP(SYS_BOOT5), (IEN | PTD | DIS | M4)) /*GPIO_7*/\ - MUX_VAL(CP(SYS_BOOT6), (IDIS | PTD | DIS | M4)) /*GPIO_8*/\ - MUX_VAL(CP(SYS_OFF_MODE), (IEN | PTD | DIS | M0)) /*SYS_OFF_MD*/\ - MUX_VAL(CP(SYS_CLKOUT1), (IEN | PTD | DIS | M0)) /*SYS_CLKOUT*/\ - MUX_VAL(CP(SYS_CLKOUT2), (IEN | PTU | EN | M4)) /*GPIO_186*/\ - MUX_VAL(CP(ETK_CLK_ES2), (IDIS | PTU | EN | M3)) /*HSUSB1_STP*/\ - MUX_VAL(CP(ETK_CTL_ES2), (IDIS | PTU | DIS | M3)) /*HSUSB1_CLK*/\ - MUX_VAL(CP(ETK_D0_ES2), (IEN | PTU | DIS | M3)) /*HSUSB1_DA0*/\ - MUX_VAL(CP(ETK_D1_ES2), (IEN | PTU | DIS | M3)) /*HSUSB1_DA1*/\ - MUX_VAL(CP(ETK_D2_ES2), (IEN | PTU | DIS | M3)) /*HSUSB1_DA2*/\ - MUX_VAL(CP(ETK_D3_ES2), (IEN | PTU | DIS | M3)) /*HSUSB1_DA7*/\ - MUX_VAL(CP(ETK_D4_ES2), (IEN | PTU | DIS | M3)) /*HSUSB1_DA4*/\ - MUX_VAL(CP(ETK_D5_ES2), (IEN | PTU | DIS | M3)) /*HSUSB1_DA5*/\ - MUX_VAL(CP(ETK_D6_ES2), (IEN | PTU | DIS | M3)) /*HSUSB1_DA6*/\ - MUX_VAL(CP(ETK_D7_ES2), (IEN | PTU | DIS | M3)) /*HSUSB1_DA3*/\ - MUX_VAL(CP(ETK_D8_ES2), (IEN | PTU | DIS | M3)) /*HSUSB1_DIR*/\ - MUX_VAL(CP(ETK_D9_ES2), (IEN | PTU | DIS | M3)) /*HSUSB1_NXT*/\ - MUX_VAL(CP(D2D_MCAD1), (IEN | PTD | EN | M0)) /*d2d_mcad1*/\ - MUX_VAL(CP(D2D_MCAD2), (IEN | PTD | EN | M0)) /*d2d_mcad2*/\ - MUX_VAL(CP(D2D_MCAD3), (IEN | PTD | EN | M0)) /*d2d_mcad3*/\ - MUX_VAL(CP(D2D_MCAD4), (IEN | PTD | EN | M0)) /*d2d_mcad4*/\ - MUX_VAL(CP(D2D_MCAD5), (IEN | PTD | EN | M0)) /*d2d_mcad5*/\ - MUX_VAL(CP(D2D_MCAD6), (IEN | PTD | EN | M0)) /*d2d_mcad6*/\ - MUX_VAL(CP(D2D_MCAD7), (IEN | PTD | EN | M0)) /*d2d_mcad7*/\ - MUX_VAL(CP(D2D_MCAD8), (IEN | PTD | EN | M0)) /*d2d_mcad8*/\ - MUX_VAL(CP(D2D_MCAD9), (IEN | PTD | EN | M0)) /*d2d_mcad9*/\ - MUX_VAL(CP(D2D_MCAD10), (IEN | PTD | EN | M0)) /*d2d_mcad10*/\ - MUX_VAL(CP(D2D_MCAD11), (IEN | PTD | EN | M0)) /*d2d_mcad11*/\ - MUX_VAL(CP(D2D_MCAD12), (IEN | PTD | EN | M0)) /*d2d_mcad12*/\ - MUX_VAL(CP(D2D_MCAD13), (IEN | PTD | EN | M0)) /*d2d_mcad13*/\ - MUX_VAL(CP(D2D_MCAD14), (IEN | PTD | EN | M0)) /*d2d_mcad14*/\ - MUX_VAL(CP(D2D_MCAD15), (IEN | PTD | EN | M0)) /*d2d_mcad15*/\ - MUX_VAL(CP(D2D_MCAD16), (IEN | PTD | EN | M0)) /*d2d_mcad16*/\ - MUX_VAL(CP(D2D_MCAD17), (IEN | PTD | EN | M0)) /*d2d_mcad17*/\ - MUX_VAL(CP(D2D_MCAD18), (IEN | PTD | EN | M0)) /*d2d_mcad18*/\ - MUX_VAL(CP(D2D_MCAD19), (IEN | PTD | EN | M0)) /*d2d_mcad19*/\ - MUX_VAL(CP(D2D_MCAD20), (IEN | PTD | EN | M0)) /*d2d_mcad20*/\ - MUX_VAL(CP(D2D_MCAD21), (IEN | PTD | EN | M0)) /*d2d_mcad21*/\ - MUX_VAL(CP(D2D_MCAD22), (IEN | PTD | EN | M0)) /*d2d_mcad22*/\ - MUX_VAL(CP(D2D_MCAD23), (IEN | PTD | EN | M0)) /*d2d_mcad23*/\ - MUX_VAL(CP(D2D_MCAD24), (IEN | PTD | EN | M0)) /*d2d_mcad24*/\ - MUX_VAL(CP(D2D_MCAD25), (IEN | PTD | EN | M0)) /*d2d_mcad25*/\ - MUX_VAL(CP(D2D_MCAD26), (IEN | PTD | EN | M0)) /*d2d_mcad26*/\ - MUX_VAL(CP(D2D_MCAD27), (IEN | PTD | EN | M0)) /*d2d_mcad27*/\ - MUX_VAL(CP(D2D_MCAD28), (IEN | PTD | EN | M0)) /*d2d_mcad28*/\ - MUX_VAL(CP(D2D_MCAD29), (IEN | PTD | EN | M0)) /*d2d_mcad29*/\ - MUX_VAL(CP(D2D_MCAD30), (IEN | PTD | EN | M0)) /*d2d_mcad30*/\ - MUX_VAL(CP(D2D_MCAD31), (IEN | PTD | EN | M0)) /*d2d_mcad31*/\ - MUX_VAL(CP(D2D_MCAD32), (IEN | PTD | EN | M0)) /*d2d_mcad32*/\ - MUX_VAL(CP(D2D_MCAD33), (IEN | PTD | EN | M0)) /*d2d_mcad33*/\ - MUX_VAL(CP(D2D_MCAD34), (IEN | PTD | EN | M0)) /*d2d_mcad34*/\ - MUX_VAL(CP(D2D_MCAD35), (IEN | PTD | EN | M0)) /*d2d_mcad35*/\ - MUX_VAL(CP(D2D_MCAD36), (IEN | PTD | EN | M0)) /*d2d_mcad36*/\ - MUX_VAL(CP(D2D_CLK26MI), (IEN | PTD | DIS | M0)) /*d2d_clk26m*/\ - MUX_VAL(CP(D2D_NRESPWRON), (IEN | PTD | EN | M0)) /*d2d_nrespw*/\ - MUX_VAL(CP(D2D_NRESWARM), (IEN | PTU | EN | M0)) /*d2d_nreswa*/\ - MUX_VAL(CP(D2D_ARM9NIRQ), (IEN | PTD | DIS | M0)) /*d2d_arm9ni*/\ - MUX_VAL(CP(D2D_UMA2P6FIQ), (IEN | PTD | DIS | M0)) /*d2d_uma2p6*/\ - MUX_VAL(CP(D2D_SPINT), (IEN | PTD | EN | M0)) /*d2d_spint*/\ - MUX_VAL(CP(D2D_FRINT), (IEN | PTD | EN | M0)) /*d2d_frint*/\ - MUX_VAL(CP(D2D_DMAREQ0), (IEN | PTD | DIS | M0)) /*d2d_dmare0*/\ - MUX_VAL(CP(D2D_DMAREQ1), (IEN | PTD | DIS | M0)) /*d2d_dmare1*/\ - MUX_VAL(CP(D2D_DMAREQ2), (IEN | PTD | DIS | M0)) /*d2d_dmare2*/\ - MUX_VAL(CP(D2D_DMAREQ3), (IEN | PTD | DIS | M0)) /*d2d_dmare3*/\ - MUX_VAL(CP(D2D_N3GTRST), (IEN | PTD | DIS | M0)) /*d2d_n3gtrs*/\ - MUX_VAL(CP(D2D_N3GTDI), (IEN | PTD | DIS | M0)) /*d2d_n3gtdi*/\ - MUX_VAL(CP(D2D_N3GTDO), (IEN | PTD | DIS | M0)) /*d2d_n3gtdo*/\ - MUX_VAL(CP(D2D_N3GTMS), (IEN | PTD | DIS | M0)) /*d2d_n3gtms*/\ - MUX_VAL(CP(D2D_N3GTCK), (IEN | PTD | DIS | M0)) /*d2d_n3gtck*/\ - MUX_VAL(CP(D2D_N3GRTCK), (IEN | PTD | DIS | M0)) /*d2d_n3grtc*/\ - MUX_VAL(CP(D2D_MSTDBY), (IEN | PTU | EN | M0)) /*d2d_mstdby*/\ - MUX_VAL(CP(D2D_SWAKEUP), (IEN | PTD | EN | M0)) /*d2d_swakeu*/\ - MUX_VAL(CP(D2D_IDLEREQ), (IEN | PTD | DIS | M0)) /*d2d_idlere*/\ - MUX_VAL(CP(D2D_IDLEACK), (IEN | PTU | EN | M0)) /*d2d_idleac*/\ - MUX_VAL(CP(D2D_MWRITE), (IEN | PTD | DIS | M0)) /*d2d_mwrite*/\ - MUX_VAL(CP(D2D_SWRITE), (IEN | PTD | DIS | M0)) /*d2d_swrite*/\ - MUX_VAL(CP(D2D_MREAD), (IEN | PTD | DIS | M0)) /*d2d_mread*/\ - MUX_VAL(CP(D2D_SREAD), (IEN | PTD | DIS | M0)) /*d2d_sread*/\ - MUX_VAL(CP(D2D_MBUSFLAG), (IEN | PTD | DIS | M0)) /*d2d_mbusfl*/\ - MUX_VAL(CP(D2D_SBUSFLAG), (IEN | PTD | DIS | M0)) /*d2d_sbusfl*/\ - MUX_VAL(CP(SDRC_CKE0), (IDIS | PTU | EN | M0)) /*sdrc_cke0*/\ - MUX_VAL(CP(SDRC_CKE1), (IDIS | PTU | EN | M0)) /*sdrc_cke1*/ - -#define MUX_RX51_C() \ - MUX_VAL(CP(MCBSP3_DX), (IEN | PTD | DIS | M4)) /*GPIO_140*/\ - MUX_VAL(CP(MCBSP3_DR), (IEN | PTD | DIS | M4)) /*GPIO_142*/\ - MUX_VAL(CP(MCBSP3_CLKX), (IEN | PTD | DIS | M4)) /*GPIO_141*/\ - MUX_VAL(CP(UART2_CTS), (IEN | PTU | EN | M0)) /*UART2_CTS*/\ - MUX_VAL(CP(UART2_RTS), (IDIS | PTD | DIS | M0)) /*UART2_RTS*/\ - MUX_VAL(CP(UART2_TX), (IDIS | PTD | DIS | M0)) /*UART2_TX*/ - #define ONENAND_GPMC_CONFIG1_RX51 0xfb001202 #define ONENAND_GPMC_CONFIG2_RX51 0x00111100 #define ONENAND_GPMC_CONFIG3_RX51 0x00020200
After removal of MUX configuration there is no need to have extra rx51.h.
Signed-off-by: Pali Rohár pali@kernel.org --- board/nokia/rx51/rx51.c | 17 ++++++++++++++++- board/nokia/rx51/rx51.h | 31 ------------------------------- 2 files changed, 16 insertions(+), 32 deletions(-) delete mode 100644 board/nokia/rx51/rx51.h
diff --git a/board/nokia/rx51/rx51.c b/board/nokia/rx51/rx51.c index 78edd2145c..58fc779ad3 100644 --- a/board/nokia/rx51/rx51.c +++ b/board/nokia/rx51/rx51.c @@ -39,9 +39,24 @@ #include <asm/arch/sys_proto.h> #include <asm/arch/mmc_host_def.h>
-#include "rx51.h" #include "tag_omap.h"
+/* Needed for ROM SMC call */ +struct emu_hal_params_rx51 { + u32 num_params; + u32 param1; + u32 param2; + u32 param3; + u32 param4; +}; + +#define ONENAND_GPMC_CONFIG1_RX51 0xfb001202 +#define ONENAND_GPMC_CONFIG2_RX51 0x00111100 +#define ONENAND_GPMC_CONFIG3_RX51 0x00020200 +#define ONENAND_GPMC_CONFIG4_RX51 0x11001102 +#define ONENAND_GPMC_CONFIG5_RX51 0x03101616 +#define ONENAND_GPMC_CONFIG6_RX51 0x90060000 + DECLARE_GLOBAL_DATA_PTR;
GraphicDevice gdev; diff --git a/board/nokia/rx51/rx51.h b/board/nokia/rx51/rx51.h deleted file mode 100644 index 0eddb06219..0000000000 --- a/board/nokia/rx51/rx51.h +++ /dev/null @@ -1,31 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ -/* - * (C) Copyright 2012 - * Ивайло Димитров freemangordon@abv.bg - * - * (C) Copyright 2011-2012 - * Pali Rohár pali@kernel.org - * - * (C) Copyright 2008 - * Dirk Behme dirk.behme@gmail.com - */ -#ifndef _RX51_H_ -#define _RX51_H_ - -/* Needed for ROM SMC call */ -struct emu_hal_params_rx51 { - u32 num_params; - u32 param1; - u32 param2; - u32 param3; - u32 param4; -}; - -#define ONENAND_GPMC_CONFIG1_RX51 0xfb001202 -#define ONENAND_GPMC_CONFIG2_RX51 0x00111100 -#define ONENAND_GPMC_CONFIG3_RX51 0x00020200 -#define ONENAND_GPMC_CONFIG4_RX51 0x11001102 -#define ONENAND_GPMC_CONFIG5_RX51 0x03101616 -#define ONENAND_GPMC_CONFIG6_RX51 0x90060000 - -#endif
Now when usbtty serial console is fixed in U-Boot enable it for Nokia RX-51 board by default.
CONFIG_CONSOLE_MUX is already used and U-Boot console is available for all in/out devices. Therefore there is no need to have separate commands 'run sercon', 'run usbcon' and 'run vgacon', so remove them.
As space for U-Boot is limited to 256kB, disable some other unused options so CONFIG_USB_TTY can be enabled.
Nokia RX-51 does not have easily accessible UART serial console so the only option for easy debugging is to use device's keyboard+screen or this usbtty serial console over USB.
Signed-off-by: Pali Rohár pali@kernel.org --- configs/nokia_rx51_defconfig | 6 +++--- doc/README.nokia_rx51 | 15 +-------------- include/configs/nokia_rx51.h | 16 ++++------------ 3 files changed, 8 insertions(+), 29 deletions(-)
diff --git a/configs/nokia_rx51_defconfig b/configs/nokia_rx51_defconfig index 0f05fe6fc3..e1b874a870 100644 --- a/configs/nokia_rx51_defconfig +++ b/configs/nokia_rx51_defconfig @@ -44,18 +44,16 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=onenand:128k(bootloader)ro,384k(config),256k(l CONFIG_ENV_OVERWRITE=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y # CONFIG_NET is not set -CONFIG_TWL4030_LED=y # CONFIG_MMC_HW_PARTITIONING is not set +# CONFIG_MMC_VERBOSE is not set CONFIG_MMC_OMAP_HS=y CONFIG_MTD=y CONFIG_CONS_INDEX=3 CONFIG_SYS_NS16550=y CONFIG_SPI=y CONFIG_USB=y -CONFIG_USB_MUSB_HCD=y CONFIG_USB_MUSB_UDC=y CONFIG_USB_OMAP3=y -CONFIG_TWL4030_USB=y CONFIG_CFB_CONSOLE=y CONFIG_CFB_CONSOLE_ANSI=y # CONFIG_VGA_AS_SINGLE_DEVICE is not set @@ -66,3 +64,5 @@ CONFIG_DM_I2C=y CONFIG_DM_MMC=y # CONFIG_DM_DEVICE_REMOVE is not set # CONFIG_SYS_MALLOC_F is not set +# CONFIG_DM_WARN is not set +# CONFIG_BLOCK_CACHE is not set diff --git a/doc/README.nokia_rx51 b/doc/README.nokia_rx51 index 320b5efc7d..84d1912ddd 100644 --- a/doc/README.nokia_rx51 +++ b/doc/README.nokia_rx51 @@ -24,8 +24,7 @@ called u-boot-gen-combined. It is available in following repository: There is support for hardware watchdog. Hardware watchdog is started by NOLO so u-boot must kick watchdog to prevent reboot device (but not very often, max every 2 seconds). There is also support for framebuffer display -output with ANSI escape codes and the N900 HW keyboard input. USB tty works -but is disabled because it prevents the current Maemo kernel from booting. +output with ANSI escape codes and the N900 HW keyboard input.
When U-Boot is starting it enable IBE bit in Auxiliary Control Register, which is needed for Thumb-2 ISA support. It is workaround for errata 430973. @@ -49,10 +48,6 @@ Boot from SD or eMMC in this order:
Available additional commands/variables:
- * run sercon - Use serial port for control - * run usbcon - Use usbtty for control - * run vgacon - Use framebuffer and HW keyboard for control (default) - * run sdboot - Boot from external SD card (see boot order) * run emmcboot - Boot from internal eMMC memory (see boot order) * run attachboot - Boot attached kernel image (attached to U-Boot binary) @@ -87,14 +82,6 @@ Additional variables for booting kernel: and u-boot standard output is set to serial then setup_console_atag is automatically set to 1. So output from Maemo kernel would go to serial port.
-USB TTY: - - Maemo kernel 2.6.28 will crash if u-boot enable usb tty. So USB TTY is disabled. - For enabling USB TTY just add this line to file include/configs/nokia_rx51.h - - #define CONFIG_USB_TTY - - UBIFS support:
UBIFS support is disabled, because U-Boot image is too big and cannot be diff --git a/include/configs/nokia_rx51.h b/include/configs/nokia_rx51.h index 6879f52a0c..36b1f9221c 100644 --- a/include/configs/nokia_rx51.h +++ b/include/configs/nokia_rx51.h @@ -70,6 +70,7 @@
/* USB device configuration */ #define CONFIG_USB_DEVICE +#define CONFIG_USB_TTY #define CONFIG_USBD_VENDORID 0x0421 #define CONFIG_USBD_PRODUCTID 0x01c8 #define CONFIG_USBD_MANUFACTURER "Nokia" @@ -108,15 +109,9 @@ int rx51_kp_getc(struct stdio_dev *sdev); /* Environment information */ #define CONFIG_EXTRA_ENV_SETTINGS \ "usbtty=cdc_acm\0" \ - "stdin=serial,vga\0" \ - "stdout=serial,vga\0" \ - "stderr=serial,vga\0" \ - "setcon=setenv stdin ${con};" \ - "setenv stdout ${con};" \ - "setenv stderr ${con}\0" \ - "sercon=setenv con serial; run setcon\0" \ - "usbcon=setenv con usbtty; run setcon\0" \ - "vgacon=setenv con vga; run setcon\0" \ + "stdin=usbtty,serial,vga\0" \ + "stdout=usbtty,serial,vga\0" \ + "stderr=usbtty,serial,vga\0" \ "slide=gpio input " __stringify(GPIO_SLIDE) "\0" \ "switchmmc=mmc dev ${mmcnum}\0" \ "kernaddr=0x82008000\0" \ @@ -209,9 +204,6 @@ int rx51_kp_getc(struct stdio_dev *sdev); #define CONFIG_POSTBOOTMENU \ "echo;" \ "echo Extra commands:;" \ - "echo run sercon - Use serial port for control.;" \ - "echo run usbcon - Use usbtty for control.;" \ - "echo run vgacon - Use framebuffer/keyboard.;" \ "echo run sdboot - Boot from SD card slot.;" \ "echo run emmcboot - Boot internal eMMC memory.;" \ "echo run attachboot - Boot attached kernel image.;" \
On Sun 2020-11-29 17:52:52, Pali Rohár wrote:
Now when usbtty serial console is fixed in U-Boot enable it for Nokia RX-51 board by default.
CONFIG_CONSOLE_MUX is already used and U-Boot console is available for all in/out devices. Therefore there is no need to have separate commands 'run sercon', 'run usbcon' and 'run vgacon', so remove them.
As space for U-Boot is limited to 256kB, disable some other unused options so CONFIG_USB_TTY can be enabled.
Nokia RX-51 does not have easily accessible UART serial console so the only option for easy debugging is to use device's keyboard+screen or this usbtty serial console over USB.
Signed-off-by: Pali Rohár pali@kernel.org
11-13 Reviewed-by: Pavel Machek pavel@ucw.cz
Best regards, Pavel
Now when usbtty serial console is fixed in U-Boot enable CONFIG_USB_TTY for Nokia RX-51 board by default.
Fix also USB product id as U-Boot ignores CONFIG_USBD_PRODUCTID macro and include U-Boot string into USB product name to indicate usage of U-Boot.
CONFIG_CONSOLE_MUX is already used and U-Boot console is available for all in/out devices. Therefore there is no need to have separate commands 'run sercon', 'run usbcon' and 'run vgacon', so remove them.
As space for U-Boot is limited to 256kB, disable some other unused options so CONFIG_USB_TTY can be enabled.
Nokia RX-51 does not have easily accessible UART serial console so the only option for easy debugging is to use device's keyboard+screen or this usbtty serial console over USB.
Signed-off-by: Pali Rohár pali@kernel.org --- Changes since v1: * Fixed USB product id and product name * Disabled some other options to free more space * Changes now passed CI tests: https://dev.azure.com/u-boot/u-boot/_build/results?buildId=1492&view=res...
Note that this patch depends on other Nokia RX-51 patches which are on mailing list, otherwise CI tests do not pass:
https://patchwork.ozlabs.org/project/uboot/patch/20201121223011.14262-1-pali... https://patchwork.ozlabs.org/project/uboot/patch/20201121223317.14347-1-pali... https://patchwork.ozlabs.org/project/uboot/patch/20201129161505.5092-1-pali@... https://patchwork.ozlabs.org/project/uboot/patch/20201130191034.795-1-pali@k... --- configs/nokia_rx51_defconfig | 8 +++++--- doc/README.nokia_rx51 | 15 +-------------- include/configs/nokia_rx51.h | 21 +++++++-------------- 3 files changed, 13 insertions(+), 31 deletions(-)
diff --git a/configs/nokia_rx51_defconfig b/configs/nokia_rx51_defconfig index 0f05fe6fc3..963dd145ce 100644 --- a/configs/nokia_rx51_defconfig +++ b/configs/nokia_rx51_defconfig @@ -44,18 +44,16 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=onenand:128k(bootloader)ro,384k(config),256k(l CONFIG_ENV_OVERWRITE=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y # CONFIG_NET is not set -CONFIG_TWL4030_LED=y # CONFIG_MMC_HW_PARTITIONING is not set +# CONFIG_MMC_VERBOSE is not set CONFIG_MMC_OMAP_HS=y CONFIG_MTD=y CONFIG_CONS_INDEX=3 CONFIG_SYS_NS16550=y CONFIG_SPI=y CONFIG_USB=y -CONFIG_USB_MUSB_HCD=y CONFIG_USB_MUSB_UDC=y CONFIG_USB_OMAP3=y -CONFIG_TWL4030_USB=y CONFIG_CFB_CONSOLE=y CONFIG_CFB_CONSOLE_ANSI=y # CONFIG_VGA_AS_SINGLE_DEVICE is not set @@ -66,3 +64,7 @@ CONFIG_DM_I2C=y CONFIG_DM_MMC=y # CONFIG_DM_DEVICE_REMOVE is not set # CONFIG_SYS_MALLOC_F is not set +# CONFIG_DM_WARN is not set +# CONFIG_DM_SEQ_ALIAS is not set +# CONFIG_BLOCK_CACHE is not set +# CONFIG_SYS_DEVICE_NULLDEV is not set diff --git a/doc/README.nokia_rx51 b/doc/README.nokia_rx51 index 320b5efc7d..84d1912ddd 100644 --- a/doc/README.nokia_rx51 +++ b/doc/README.nokia_rx51 @@ -24,8 +24,7 @@ called u-boot-gen-combined. It is available in following repository: There is support for hardware watchdog. Hardware watchdog is started by NOLO so u-boot must kick watchdog to prevent reboot device (but not very often, max every 2 seconds). There is also support for framebuffer display -output with ANSI escape codes and the N900 HW keyboard input. USB tty works -but is disabled because it prevents the current Maemo kernel from booting. +output with ANSI escape codes and the N900 HW keyboard input.
When U-Boot is starting it enable IBE bit in Auxiliary Control Register, which is needed for Thumb-2 ISA support. It is workaround for errata 430973. @@ -49,10 +48,6 @@ Boot from SD or eMMC in this order:
Available additional commands/variables:
- * run sercon - Use serial port for control - * run usbcon - Use usbtty for control - * run vgacon - Use framebuffer and HW keyboard for control (default) - * run sdboot - Boot from external SD card (see boot order) * run emmcboot - Boot from internal eMMC memory (see boot order) * run attachboot - Boot attached kernel image (attached to U-Boot binary) @@ -87,14 +82,6 @@ Additional variables for booting kernel: and u-boot standard output is set to serial then setup_console_atag is automatically set to 1. So output from Maemo kernel would go to serial port.
-USB TTY: - - Maemo kernel 2.6.28 will crash if u-boot enable usb tty. So USB TTY is disabled. - For enabling USB TTY just add this line to file include/configs/nokia_rx51.h - - #define CONFIG_USB_TTY - - UBIFS support:
UBIFS support is disabled, because U-Boot image is too big and cannot be diff --git a/include/configs/nokia_rx51.h b/include/configs/nokia_rx51.h index 3f2700d8e2..23368de624 100644 --- a/include/configs/nokia_rx51.h +++ b/include/configs/nokia_rx51.h @@ -70,10 +70,12 @@
/* USB device configuration */ #define CONFIG_USB_DEVICE +#define CONFIG_USB_TTY #define CONFIG_USBD_VENDORID 0x0421 -#define CONFIG_USBD_PRODUCTID 0x01c8 +#define CONFIG_USBD_PRODUCTID_CDCACM 0x01c8 +#define CONFIG_USBD_PRODUCTID_GSERIAL 0x01c8 #define CONFIG_USBD_MANUFACTURER "Nokia" -#define CONFIG_USBD_PRODUCT_NAME "N900" +#define CONFIG_USBD_PRODUCT_NAME "N900 (U-Boot)"
#define GPIO_SLIDE 71
@@ -108,15 +110,9 @@ int rx51_kp_getc(struct stdio_dev *sdev); /* Environment information */ #define CONFIG_EXTRA_ENV_SETTINGS \ "usbtty=cdc_acm\0" \ - "stdin=serial,vga\0" \ - "stdout=serial,vga\0" \ - "stderr=serial,vga\0" \ - "setcon=setenv stdin ${con};" \ - "setenv stdout ${con};" \ - "setenv stderr ${con}\0" \ - "sercon=setenv con serial; run setcon\0" \ - "usbcon=setenv con usbtty; run setcon\0" \ - "vgacon=setenv con vga; run setcon\0" \ + "stdin=usbtty,serial,vga\0" \ + "stdout=usbtty,serial,vga\0" \ + "stderr=usbtty,serial,vga\0" \ "slide=gpio input " __stringify(GPIO_SLIDE) "\0" \ "switchmmc=mmc dev ${mmcnum}\0" \ "kernaddr=0x82008000\0" \ @@ -198,9 +194,6 @@ int rx51_kp_getc(struct stdio_dev *sdev); #define CONFIG_POSTBOOTMENU \ "echo;" \ "echo Extra commands:;" \ - "echo run sercon - Use serial port for control.;" \ - "echo run usbcon - Use usbtty for control.;" \ - "echo run vgacon - Use framebuffer/keyboard.;" \ "echo run sdboot - Boot from SD card slot.;" \ "echo run emmcboot - Boot internal eMMC memory.;" \ "echo run attachboot - Boot attached kernel image.;" \
On 01/12/20 12:57 am, Pali Rohár wrote:
Now when usbtty serial console is fixed in U-Boot enable CONFIG_USB_TTY for Nokia RX-51 board by default.
Fix also USB product id as U-Boot ignores CONFIG_USBD_PRODUCTID macro and include U-Boot string into USB product name to indicate usage of U-Boot.
CONFIG_CONSOLE_MUX is already used and U-Boot console is available for all in/out devices. Therefore there is no need to have separate commands 'run sercon', 'run usbcon' and 'run vgacon', so remove them.
As space for U-Boot is limited to 256kB, disable some other unused options so CONFIG_USB_TTY can be enabled.
Nokia RX-51 does not have easily accessible UART serial console so the only option for easy debugging is to use device's keyboard+screen or this usbtty serial console over USB.
Signed-off-by: Pali Rohár pali@kernel.org
Changes since v1:
- Fixed USB product id and product name
- Disabled some other options to free more space
- Changes now passed CI tests: https://dev.azure.com/u-boot/u-boot/_build/results?buildId=1492&view=res...
Note that this patch depends on other Nokia RX-51 patches which are on mailing list, otherwise CI tests do not pass:
https://patchwork.ozlabs.org/project/uboot/patch/20201121223011.14262-1-pali... https://patchwork.ozlabs.org/project/uboot/patch/20201121223317.14347-1-pali... https://patchwork.ozlabs.org/project/uboot/patch/20201129161505.5092-1-pali@... https://patchwork.ozlabs.org/project/uboot/patch/20201130191034.795-1-pali@k...
okay, Ill wait for all these patches to get merged, before I pick this patch.
Thanks and regards, Lokesh
configs/nokia_rx51_defconfig | 8 +++++--- doc/README.nokia_rx51 | 15 +-------------- include/configs/nokia_rx51.h | 21 +++++++-------------- 3 files changed, 13 insertions(+), 31 deletions(-)
diff --git a/configs/nokia_rx51_defconfig b/configs/nokia_rx51_defconfig index 0f05fe6fc3..963dd145ce 100644 --- a/configs/nokia_rx51_defconfig +++ b/configs/nokia_rx51_defconfig @@ -44,18 +44,16 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=onenand:128k(bootloader)ro,384k(config),256k(l CONFIG_ENV_OVERWRITE=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y # CONFIG_NET is not set -CONFIG_TWL4030_LED=y # CONFIG_MMC_HW_PARTITIONING is not set +# CONFIG_MMC_VERBOSE is not set CONFIG_MMC_OMAP_HS=y CONFIG_MTD=y CONFIG_CONS_INDEX=3 CONFIG_SYS_NS16550=y CONFIG_SPI=y CONFIG_USB=y -CONFIG_USB_MUSB_HCD=y CONFIG_USB_MUSB_UDC=y CONFIG_USB_OMAP3=y -CONFIG_TWL4030_USB=y CONFIG_CFB_CONSOLE=y CONFIG_CFB_CONSOLE_ANSI=y # CONFIG_VGA_AS_SINGLE_DEVICE is not set @@ -66,3 +64,7 @@ CONFIG_DM_I2C=y CONFIG_DM_MMC=y # CONFIG_DM_DEVICE_REMOVE is not set # CONFIG_SYS_MALLOC_F is not set +# CONFIG_DM_WARN is not set +# CONFIG_DM_SEQ_ALIAS is not set +# CONFIG_BLOCK_CACHE is not set +# CONFIG_SYS_DEVICE_NULLDEV is not set diff --git a/doc/README.nokia_rx51 b/doc/README.nokia_rx51 index 320b5efc7d..84d1912ddd 100644 --- a/doc/README.nokia_rx51 +++ b/doc/README.nokia_rx51 @@ -24,8 +24,7 @@ called u-boot-gen-combined. It is available in following repository: There is support for hardware watchdog. Hardware watchdog is started by NOLO so u-boot must kick watchdog to prevent reboot device (but not very often, max every 2 seconds). There is also support for framebuffer display -output with ANSI escape codes and the N900 HW keyboard input. USB tty works -but is disabled because it prevents the current Maemo kernel from booting. +output with ANSI escape codes and the N900 HW keyboard input.
When U-Boot is starting it enable IBE bit in Auxiliary Control Register, which is needed for Thumb-2 ISA support. It is workaround for errata 430973. @@ -49,10 +48,6 @@ Boot from SD or eMMC in this order:
Available additional commands/variables:
- run sercon - Use serial port for control
- run usbcon - Use usbtty for control
- run vgacon - Use framebuffer and HW keyboard for control (default)
- run sdboot - Boot from external SD card (see boot order)
- run emmcboot - Boot from internal eMMC memory (see boot order)
- run attachboot - Boot attached kernel image (attached to U-Boot binary)
@@ -87,14 +82,6 @@ Additional variables for booting kernel: and u-boot standard output is set to serial then setup_console_atag is automatically set to 1. So output from Maemo kernel would go to serial port.
-USB TTY:
- Maemo kernel 2.6.28 will crash if u-boot enable usb tty. So USB TTY is disabled.
- For enabling USB TTY just add this line to file include/configs/nokia_rx51.h
- #define CONFIG_USB_TTY
UBIFS support:
UBIFS support is disabled, because U-Boot image is too big and cannot be diff --git a/include/configs/nokia_rx51.h b/include/configs/nokia_rx51.h index 3f2700d8e2..23368de624 100644 --- a/include/configs/nokia_rx51.h +++ b/include/configs/nokia_rx51.h @@ -70,10 +70,12 @@
/* USB device configuration */ #define CONFIG_USB_DEVICE +#define CONFIG_USB_TTY #define CONFIG_USBD_VENDORID 0x0421 -#define CONFIG_USBD_PRODUCTID 0x01c8 +#define CONFIG_USBD_PRODUCTID_CDCACM 0x01c8 +#define CONFIG_USBD_PRODUCTID_GSERIAL 0x01c8 #define CONFIG_USBD_MANUFACTURER "Nokia" -#define CONFIG_USBD_PRODUCT_NAME "N900" +#define CONFIG_USBD_PRODUCT_NAME "N900 (U-Boot)"
#define GPIO_SLIDE 71
@@ -108,15 +110,9 @@ int rx51_kp_getc(struct stdio_dev *sdev); /* Environment information */ #define CONFIG_EXTRA_ENV_SETTINGS \ "usbtty=cdc_acm\0" \
- "stdin=serial,vga\0" \
- "stdout=serial,vga\0" \
- "stderr=serial,vga\0" \
- "setcon=setenv stdin ${con};" \
"setenv stdout ${con};" \"setenv stderr ${con}\0" \- "sercon=setenv con serial; run setcon\0" \
- "usbcon=setenv con usbtty; run setcon\0" \
- "vgacon=setenv con vga; run setcon\0" \
- "stdin=usbtty,serial,vga\0" \
- "stdout=usbtty,serial,vga\0" \
- "stderr=usbtty,serial,vga\0" \ "slide=gpio input " __stringify(GPIO_SLIDE) "\0" \ "switchmmc=mmc dev ${mmcnum}\0" \ "kernaddr=0x82008000\0" \
@@ -198,9 +194,6 @@ int rx51_kp_getc(struct stdio_dev *sdev); #define CONFIG_POSTBOOTMENU \ "echo;" \ "echo Extra commands:;" \
- "echo run sercon - Use serial port for control.;" \
- "echo run usbcon - Use usbtty for control.;" \
- "echo run vgacon - Use framebuffer/keyboard.;" \ "echo run sdboot - Boot from SD card slot.;" \ "echo run emmcboot - Boot internal eMMC memory.;" \ "echo run attachboot - Boot attached kernel image.;" \
On Tuesday 22 December 2020 19:56:51 Lokesh Vutla wrote:
On 01/12/20 12:57 am, Pali Rohár wrote:
Now when usbtty serial console is fixed in U-Boot enable CONFIG_USB_TTY for Nokia RX-51 board by default.
Fix also USB product id as U-Boot ignores CONFIG_USBD_PRODUCTID macro and include U-Boot string into USB product name to indicate usage of U-Boot.
CONFIG_CONSOLE_MUX is already used and U-Boot console is available for all in/out devices. Therefore there is no need to have separate commands 'run sercon', 'run usbcon' and 'run vgacon', so remove them.
As space for U-Boot is limited to 256kB, disable some other unused options so CONFIG_USB_TTY can be enabled.
Nokia RX-51 does not have easily accessible UART serial console so the only option for easy debugging is to use device's keyboard+screen or this usbtty serial console over USB.
Signed-off-by: Pali Rohár pali@kernel.org
Changes since v1:
- Fixed USB product id and product name
- Disabled some other options to free more space
- Changes now passed CI tests: https://dev.azure.com/u-boot/u-boot/_build/results?buildId=1492&view=res...
Note that this patch depends on other Nokia RX-51 patches which are on mailing list, otherwise CI tests do not pass:
https://patchwork.ozlabs.org/project/uboot/patch/20201121223011.14262-1-pali... https://patchwork.ozlabs.org/project/uboot/patch/20201121223317.14347-1-pali... https://patchwork.ozlabs.org/project/uboot/patch/20201129161505.5092-1-pali@... https://patchwork.ozlabs.org/project/uboot/patch/20201130191034.795-1-pali@k...
okay, Ill wait for all these patches to get merged, before I pick this patch.
Web pages for all these patches is saying:
State: Under Review Delegated to: Lokesh Vutla
So I think these patches are also waiting for you.
Thanks and regards, Lokesh
configs/nokia_rx51_defconfig | 8 +++++--- doc/README.nokia_rx51 | 15 +-------------- include/configs/nokia_rx51.h | 21 +++++++-------------- 3 files changed, 13 insertions(+), 31 deletions(-)
diff --git a/configs/nokia_rx51_defconfig b/configs/nokia_rx51_defconfig index 0f05fe6fc3..963dd145ce 100644 --- a/configs/nokia_rx51_defconfig +++ b/configs/nokia_rx51_defconfig @@ -44,18 +44,16 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=onenand:128k(bootloader)ro,384k(config),256k(l CONFIG_ENV_OVERWRITE=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y # CONFIG_NET is not set -CONFIG_TWL4030_LED=y # CONFIG_MMC_HW_PARTITIONING is not set +# CONFIG_MMC_VERBOSE is not set CONFIG_MMC_OMAP_HS=y CONFIG_MTD=y CONFIG_CONS_INDEX=3 CONFIG_SYS_NS16550=y CONFIG_SPI=y CONFIG_USB=y -CONFIG_USB_MUSB_HCD=y CONFIG_USB_MUSB_UDC=y CONFIG_USB_OMAP3=y -CONFIG_TWL4030_USB=y CONFIG_CFB_CONSOLE=y CONFIG_CFB_CONSOLE_ANSI=y # CONFIG_VGA_AS_SINGLE_DEVICE is not set @@ -66,3 +64,7 @@ CONFIG_DM_I2C=y CONFIG_DM_MMC=y # CONFIG_DM_DEVICE_REMOVE is not set # CONFIG_SYS_MALLOC_F is not set +# CONFIG_DM_WARN is not set +# CONFIG_DM_SEQ_ALIAS is not set +# CONFIG_BLOCK_CACHE is not set +# CONFIG_SYS_DEVICE_NULLDEV is not set diff --git a/doc/README.nokia_rx51 b/doc/README.nokia_rx51 index 320b5efc7d..84d1912ddd 100644 --- a/doc/README.nokia_rx51 +++ b/doc/README.nokia_rx51 @@ -24,8 +24,7 @@ called u-boot-gen-combined. It is available in following repository: There is support for hardware watchdog. Hardware watchdog is started by NOLO so u-boot must kick watchdog to prevent reboot device (but not very often, max every 2 seconds). There is also support for framebuffer display -output with ANSI escape codes and the N900 HW keyboard input. USB tty works -but is disabled because it prevents the current Maemo kernel from booting. +output with ANSI escape codes and the N900 HW keyboard input.
When U-Boot is starting it enable IBE bit in Auxiliary Control Register, which is needed for Thumb-2 ISA support. It is workaround for errata 430973. @@ -49,10 +48,6 @@ Boot from SD or eMMC in this order:
Available additional commands/variables:
- run sercon - Use serial port for control
- run usbcon - Use usbtty for control
- run vgacon - Use framebuffer and HW keyboard for control (default)
- run sdboot - Boot from external SD card (see boot order)
- run emmcboot - Boot from internal eMMC memory (see boot order)
- run attachboot - Boot attached kernel image (attached to U-Boot binary)
@@ -87,14 +82,6 @@ Additional variables for booting kernel: and u-boot standard output is set to serial then setup_console_atag is automatically set to 1. So output from Maemo kernel would go to serial port.
-USB TTY:
- Maemo kernel 2.6.28 will crash if u-boot enable usb tty. So USB TTY is disabled.
- For enabling USB TTY just add this line to file include/configs/nokia_rx51.h
- #define CONFIG_USB_TTY
UBIFS support:
UBIFS support is disabled, because U-Boot image is too big and cannot be diff --git a/include/configs/nokia_rx51.h b/include/configs/nokia_rx51.h index 3f2700d8e2..23368de624 100644 --- a/include/configs/nokia_rx51.h +++ b/include/configs/nokia_rx51.h @@ -70,10 +70,12 @@
/* USB device configuration */ #define CONFIG_USB_DEVICE +#define CONFIG_USB_TTY #define CONFIG_USBD_VENDORID 0x0421 -#define CONFIG_USBD_PRODUCTID 0x01c8 +#define CONFIG_USBD_PRODUCTID_CDCACM 0x01c8 +#define CONFIG_USBD_PRODUCTID_GSERIAL 0x01c8 #define CONFIG_USBD_MANUFACTURER "Nokia" -#define CONFIG_USBD_PRODUCT_NAME "N900" +#define CONFIG_USBD_PRODUCT_NAME "N900 (U-Boot)"
#define GPIO_SLIDE 71
@@ -108,15 +110,9 @@ int rx51_kp_getc(struct stdio_dev *sdev); /* Environment information */ #define CONFIG_EXTRA_ENV_SETTINGS \ "usbtty=cdc_acm\0" \
- "stdin=serial,vga\0" \
- "stdout=serial,vga\0" \
- "stderr=serial,vga\0" \
- "setcon=setenv stdin ${con};" \
"setenv stdout ${con};" \"setenv stderr ${con}\0" \- "sercon=setenv con serial; run setcon\0" \
- "usbcon=setenv con usbtty; run setcon\0" \
- "vgacon=setenv con vga; run setcon\0" \
- "stdin=usbtty,serial,vga\0" \
- "stdout=usbtty,serial,vga\0" \
- "stderr=usbtty,serial,vga\0" \ "slide=gpio input " __stringify(GPIO_SLIDE) "\0" \ "switchmmc=mmc dev ${mmcnum}\0" \ "kernaddr=0x82008000\0" \
@@ -198,9 +194,6 @@ int rx51_kp_getc(struct stdio_dev *sdev); #define CONFIG_POSTBOOTMENU \ "echo;" \ "echo Extra commands:;" \
- "echo run sercon - Use serial port for control.;" \
- "echo run usbcon - Use usbtty for control.;" \
- "echo run vgacon - Use framebuffer/keyboard.;" \ "echo run sdboot - Boot from SD card slot.;" \ "echo run emmcboot - Boot internal eMMC memory.;" \ "echo run attachboot - Boot attached kernel image.;" \
On 22/12/20 8:28 pm, Pali Rohár wrote:
On Tuesday 22 December 2020 19:56:51 Lokesh Vutla wrote:
On 01/12/20 12:57 am, Pali Rohár wrote:
Now when usbtty serial console is fixed in U-Boot enable CONFIG_USB_TTY for Nokia RX-51 board by default.
Fix also USB product id as U-Boot ignores CONFIG_USBD_PRODUCTID macro and include U-Boot string into USB product name to indicate usage of U-Boot.
CONFIG_CONSOLE_MUX is already used and U-Boot console is available for all in/out devices. Therefore there is no need to have separate commands 'run sercon', 'run usbcon' and 'run vgacon', so remove them.
As space for U-Boot is limited to 256kB, disable some other unused options so CONFIG_USB_TTY can be enabled.
Nokia RX-51 does not have easily accessible UART serial console so the only option for easy debugging is to use device's keyboard+screen or this usbtty serial console over USB.
Signed-off-by: Pali Rohár pali@kernel.org
Changes since v1:
- Fixed USB product id and product name
- Disabled some other options to free more space
- Changes now passed CI tests: https://dev.azure.com/u-boot/u-boot/_build/results?buildId=1492&view=res...
Note that this patch depends on other Nokia RX-51 patches which are on mailing list, otherwise CI tests do not pass:
https://patchwork.ozlabs.org/project/uboot/patch/20201121223011.14262-1-pali... https://patchwork.ozlabs.org/project/uboot/patch/20201121223317.14347-1-pali... https://patchwork.ozlabs.org/project/uboot/patch/20201129161505.5092-1-pali@... https://patchwork.ozlabs.org/project/uboot/patch/20201130191034.795-1-pali@k...
okay, Ill wait for all these patches to get merged, before I pick this patch.
Web pages for all these patches is saying:
State: Under Review Delegated to: Lokesh Vutla
So I think these patches are also waiting for you.
The main patch I need is this[0]. Without this I am getting a build failure as you mentioned in the commit description. So, Until [0] patch is applied I cannot apply this patch. Since you combined disabling of other configs in the same patch, it is causing my pipeline failure.
Can you split the disabling of other configs into a separate patch so that others are unblocked?
Thanks and regards, Lokesh
Thanks and regards, Lokesh
configs/nokia_rx51_defconfig | 8 +++++--- doc/README.nokia_rx51 | 15 +-------------- include/configs/nokia_rx51.h | 21 +++++++-------------- 3 files changed, 13 insertions(+), 31 deletions(-)
diff --git a/configs/nokia_rx51_defconfig b/configs/nokia_rx51_defconfig index 0f05fe6fc3..963dd145ce 100644 --- a/configs/nokia_rx51_defconfig +++ b/configs/nokia_rx51_defconfig @@ -44,18 +44,16 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=onenand:128k(bootloader)ro,384k(config),256k(l CONFIG_ENV_OVERWRITE=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y # CONFIG_NET is not set -CONFIG_TWL4030_LED=y # CONFIG_MMC_HW_PARTITIONING is not set +# CONFIG_MMC_VERBOSE is not set CONFIG_MMC_OMAP_HS=y CONFIG_MTD=y CONFIG_CONS_INDEX=3 CONFIG_SYS_NS16550=y CONFIG_SPI=y CONFIG_USB=y -CONFIG_USB_MUSB_HCD=y CONFIG_USB_MUSB_UDC=y CONFIG_USB_OMAP3=y -CONFIG_TWL4030_USB=y CONFIG_CFB_CONSOLE=y CONFIG_CFB_CONSOLE_ANSI=y # CONFIG_VGA_AS_SINGLE_DEVICE is not set @@ -66,3 +64,7 @@ CONFIG_DM_I2C=y CONFIG_DM_MMC=y # CONFIG_DM_DEVICE_REMOVE is not set # CONFIG_SYS_MALLOC_F is not set +# CONFIG_DM_WARN is not set +# CONFIG_DM_SEQ_ALIAS is not set +# CONFIG_BLOCK_CACHE is not set +# CONFIG_SYS_DEVICE_NULLDEV is not set diff --git a/doc/README.nokia_rx51 b/doc/README.nokia_rx51 index 320b5efc7d..84d1912ddd 100644 --- a/doc/README.nokia_rx51 +++ b/doc/README.nokia_rx51 @@ -24,8 +24,7 @@ called u-boot-gen-combined. It is available in following repository: There is support for hardware watchdog. Hardware watchdog is started by NOLO so u-boot must kick watchdog to prevent reboot device (but not very often, max every 2 seconds). There is also support for framebuffer display -output with ANSI escape codes and the N900 HW keyboard input. USB tty works -but is disabled because it prevents the current Maemo kernel from booting. +output with ANSI escape codes and the N900 HW keyboard input.
When U-Boot is starting it enable IBE bit in Auxiliary Control Register, which is needed for Thumb-2 ISA support. It is workaround for errata 430973. @@ -49,10 +48,6 @@ Boot from SD or eMMC in this order:
Available additional commands/variables:
- run sercon - Use serial port for control
- run usbcon - Use usbtty for control
- run vgacon - Use framebuffer and HW keyboard for control (default)
- run sdboot - Boot from external SD card (see boot order)
- run emmcboot - Boot from internal eMMC memory (see boot order)
- run attachboot - Boot attached kernel image (attached to U-Boot binary)
@@ -87,14 +82,6 @@ Additional variables for booting kernel: and u-boot standard output is set to serial then setup_console_atag is automatically set to 1. So output from Maemo kernel would go to serial port.
-USB TTY:
- Maemo kernel 2.6.28 will crash if u-boot enable usb tty. So USB TTY is disabled.
- For enabling USB TTY just add this line to file include/configs/nokia_rx51.h
- #define CONFIG_USB_TTY
UBIFS support:
UBIFS support is disabled, because U-Boot image is too big and cannot be diff --git a/include/configs/nokia_rx51.h b/include/configs/nokia_rx51.h index 3f2700d8e2..23368de624 100644 --- a/include/configs/nokia_rx51.h +++ b/include/configs/nokia_rx51.h @@ -70,10 +70,12 @@
/* USB device configuration */ #define CONFIG_USB_DEVICE +#define CONFIG_USB_TTY #define CONFIG_USBD_VENDORID 0x0421 -#define CONFIG_USBD_PRODUCTID 0x01c8 +#define CONFIG_USBD_PRODUCTID_CDCACM 0x01c8 +#define CONFIG_USBD_PRODUCTID_GSERIAL 0x01c8 #define CONFIG_USBD_MANUFACTURER "Nokia" -#define CONFIG_USBD_PRODUCT_NAME "N900" +#define CONFIG_USBD_PRODUCT_NAME "N900 (U-Boot)"
#define GPIO_SLIDE 71
@@ -108,15 +110,9 @@ int rx51_kp_getc(struct stdio_dev *sdev); /* Environment information */ #define CONFIG_EXTRA_ENV_SETTINGS \ "usbtty=cdc_acm\0" \
- "stdin=serial,vga\0" \
- "stdout=serial,vga\0" \
- "stderr=serial,vga\0" \
- "setcon=setenv stdin ${con};" \
"setenv stdout ${con};" \"setenv stderr ${con}\0" \- "sercon=setenv con serial; run setcon\0" \
- "usbcon=setenv con usbtty; run setcon\0" \
- "vgacon=setenv con vga; run setcon\0" \
- "stdin=usbtty,serial,vga\0" \
- "stdout=usbtty,serial,vga\0" \
- "stderr=usbtty,serial,vga\0" \ "slide=gpio input " __stringify(GPIO_SLIDE) "\0" \ "switchmmc=mmc dev ${mmcnum}\0" \ "kernaddr=0x82008000\0" \
@@ -198,9 +194,6 @@ int rx51_kp_getc(struct stdio_dev *sdev); #define CONFIG_POSTBOOTMENU \ "echo;" \ "echo Extra commands:;" \
- "echo run sercon - Use serial port for control.;" \
- "echo run usbcon - Use usbtty for control.;" \
- "echo run vgacon - Use framebuffer/keyboard.;" \ "echo run sdboot - Boot from SD card slot.;" \ "echo run emmcboot - Boot internal eMMC memory.;" \ "echo run attachboot - Boot attached kernel image.;" \
On 22/12/20 8:36 pm, Lokesh Vutla wrote:
On 22/12/20 8:28 pm, Pali Rohár wrote:
On Tuesday 22 December 2020 19:56:51 Lokesh Vutla wrote:
On 01/12/20 12:57 am, Pali Rohár wrote:
Now when usbtty serial console is fixed in U-Boot enable CONFIG_USB_TTY for Nokia RX-51 board by default.
Fix also USB product id as U-Boot ignores CONFIG_USBD_PRODUCTID macro and include U-Boot string into USB product name to indicate usage of U-Boot.
CONFIG_CONSOLE_MUX is already used and U-Boot console is available for all in/out devices. Therefore there is no need to have separate commands 'run sercon', 'run usbcon' and 'run vgacon', so remove them.
As space for U-Boot is limited to 256kB, disable some other unused options so CONFIG_USB_TTY can be enabled.
Nokia RX-51 does not have easily accessible UART serial console so the only option for easy debugging is to use device's keyboard+screen or this usbtty serial console over USB.
Signed-off-by: Pali Rohár pali@kernel.org
Changes since v1:
- Fixed USB product id and product name
- Disabled some other options to free more space
- Changes now passed CI tests: https://dev.azure.com/u-boot/u-boot/_build/results?buildId=1492&view=res...
Note that this patch depends on other Nokia RX-51 patches which are on mailing list, otherwise CI tests do not pass:
https://patchwork.ozlabs.org/project/uboot/patch/20201121223011.14262-1-pali... https://patchwork.ozlabs.org/project/uboot/patch/20201121223317.14347-1-pali... https://patchwork.ozlabs.org/project/uboot/patch/20201129161505.5092-1-pali@... https://patchwork.ozlabs.org/project/uboot/patch/20201130191034.795-1-pali@k...
okay, Ill wait for all these patches to get merged, before I pick this patch.
Web pages for all these patches is saying:
State: Under Review Delegated to: Lokesh Vutla
So I think these patches are also waiting for you.
The main patch I need is this[0]. Without this I am getting a build failure as you mentioned in the commit description. So, Until [0] patch is applied I cannot apply this patch. Since you combined disabling of other configs in the same patch, it is causing my pipeline failure.
Can you split the disabling of other configs into a separate patch so that others are unblocked?
[0] https://patchwork.ozlabs.org/project/uboot/patch/20201130192715.1793-1-pali@...
Sorry missed this.
Thanks and regards, Lokesh
Thanks and regards, Lokesh
Thanks and regards, Lokesh
configs/nokia_rx51_defconfig | 8 +++++--- doc/README.nokia_rx51 | 15 +-------------- include/configs/nokia_rx51.h | 21 +++++++-------------- 3 files changed, 13 insertions(+), 31 deletions(-)
diff --git a/configs/nokia_rx51_defconfig b/configs/nokia_rx51_defconfig index 0f05fe6fc3..963dd145ce 100644 --- a/configs/nokia_rx51_defconfig +++ b/configs/nokia_rx51_defconfig @@ -44,18 +44,16 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=onenand:128k(bootloader)ro,384k(config),256k(l CONFIG_ENV_OVERWRITE=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y # CONFIG_NET is not set -CONFIG_TWL4030_LED=y # CONFIG_MMC_HW_PARTITIONING is not set +# CONFIG_MMC_VERBOSE is not set CONFIG_MMC_OMAP_HS=y CONFIG_MTD=y CONFIG_CONS_INDEX=3 CONFIG_SYS_NS16550=y CONFIG_SPI=y CONFIG_USB=y -CONFIG_USB_MUSB_HCD=y CONFIG_USB_MUSB_UDC=y CONFIG_USB_OMAP3=y -CONFIG_TWL4030_USB=y CONFIG_CFB_CONSOLE=y CONFIG_CFB_CONSOLE_ANSI=y # CONFIG_VGA_AS_SINGLE_DEVICE is not set @@ -66,3 +64,7 @@ CONFIG_DM_I2C=y CONFIG_DM_MMC=y # CONFIG_DM_DEVICE_REMOVE is not set # CONFIG_SYS_MALLOC_F is not set +# CONFIG_DM_WARN is not set +# CONFIG_DM_SEQ_ALIAS is not set +# CONFIG_BLOCK_CACHE is not set +# CONFIG_SYS_DEVICE_NULLDEV is not set diff --git a/doc/README.nokia_rx51 b/doc/README.nokia_rx51 index 320b5efc7d..84d1912ddd 100644 --- a/doc/README.nokia_rx51 +++ b/doc/README.nokia_rx51 @@ -24,8 +24,7 @@ called u-boot-gen-combined. It is available in following repository: There is support for hardware watchdog. Hardware watchdog is started by NOLO so u-boot must kick watchdog to prevent reboot device (but not very often, max every 2 seconds). There is also support for framebuffer display -output with ANSI escape codes and the N900 HW keyboard input. USB tty works -but is disabled because it prevents the current Maemo kernel from booting. +output with ANSI escape codes and the N900 HW keyboard input.
When U-Boot is starting it enable IBE bit in Auxiliary Control Register, which is needed for Thumb-2 ISA support. It is workaround for errata 430973. @@ -49,10 +48,6 @@ Boot from SD or eMMC in this order:
Available additional commands/variables:
- run sercon - Use serial port for control
- run usbcon - Use usbtty for control
- run vgacon - Use framebuffer and HW keyboard for control (default)
- run sdboot - Boot from external SD card (see boot order)
- run emmcboot - Boot from internal eMMC memory (see boot order)
- run attachboot - Boot attached kernel image (attached to U-Boot binary)
@@ -87,14 +82,6 @@ Additional variables for booting kernel: and u-boot standard output is set to serial then setup_console_atag is automatically set to 1. So output from Maemo kernel would go to serial port.
-USB TTY:
- Maemo kernel 2.6.28 will crash if u-boot enable usb tty. So USB TTY is disabled.
- For enabling USB TTY just add this line to file include/configs/nokia_rx51.h
- #define CONFIG_USB_TTY
UBIFS support:
UBIFS support is disabled, because U-Boot image is too big and cannot be diff --git a/include/configs/nokia_rx51.h b/include/configs/nokia_rx51.h index 3f2700d8e2..23368de624 100644 --- a/include/configs/nokia_rx51.h +++ b/include/configs/nokia_rx51.h @@ -70,10 +70,12 @@
/* USB device configuration */ #define CONFIG_USB_DEVICE +#define CONFIG_USB_TTY #define CONFIG_USBD_VENDORID 0x0421 -#define CONFIG_USBD_PRODUCTID 0x01c8 +#define CONFIG_USBD_PRODUCTID_CDCACM 0x01c8 +#define CONFIG_USBD_PRODUCTID_GSERIAL 0x01c8 #define CONFIG_USBD_MANUFACTURER "Nokia" -#define CONFIG_USBD_PRODUCT_NAME "N900" +#define CONFIG_USBD_PRODUCT_NAME "N900 (U-Boot)"
#define GPIO_SLIDE 71
@@ -108,15 +110,9 @@ int rx51_kp_getc(struct stdio_dev *sdev); /* Environment information */ #define CONFIG_EXTRA_ENV_SETTINGS \ "usbtty=cdc_acm\0" \
- "stdin=serial,vga\0" \
- "stdout=serial,vga\0" \
- "stderr=serial,vga\0" \
- "setcon=setenv stdin ${con};" \
"setenv stdout ${con};" \"setenv stderr ${con}\0" \- "sercon=setenv con serial; run setcon\0" \
- "usbcon=setenv con usbtty; run setcon\0" \
- "vgacon=setenv con vga; run setcon\0" \
- "stdin=usbtty,serial,vga\0" \
- "stdout=usbtty,serial,vga\0" \
- "stderr=usbtty,serial,vga\0" \ "slide=gpio input " __stringify(GPIO_SLIDE) "\0" \ "switchmmc=mmc dev ${mmcnum}\0" \ "kernaddr=0x82008000\0" \
@@ -198,9 +194,6 @@ int rx51_kp_getc(struct stdio_dev *sdev); #define CONFIG_POSTBOOTMENU \ "echo;" \ "echo Extra commands:;" \
- "echo run sercon - Use serial port for control.;" \
- "echo run usbcon - Use usbtty for control.;" \
- "echo run vgacon - Use framebuffer/keyboard.;" \ "echo run sdboot - Boot from SD card slot.;" \ "echo run emmcboot - Boot internal eMMC memory.;" \ "echo run attachboot - Boot attached kernel image.;" \
On 22/12/20 8:38 pm, Lokesh Vutla wrote:
On 22/12/20 8:36 pm, Lokesh Vutla wrote:
On 22/12/20 8:28 pm, Pali Rohár wrote:
On Tuesday 22 December 2020 19:56:51 Lokesh Vutla wrote:
On 01/12/20 12:57 am, Pali Rohár wrote:
Now when usbtty serial console is fixed in U-Boot enable CONFIG_USB_TTY for Nokia RX-51 board by default.
Fix also USB product id as U-Boot ignores CONFIG_USBD_PRODUCTID macro and include U-Boot string into USB product name to indicate usage of U-Boot.
CONFIG_CONSOLE_MUX is already used and U-Boot console is available for all in/out devices. Therefore there is no need to have separate commands 'run sercon', 'run usbcon' and 'run vgacon', so remove them.
As space for U-Boot is limited to 256kB, disable some other unused options so CONFIG_USB_TTY can be enabled.
Nokia RX-51 does not have easily accessible UART serial console so the only option for easy debugging is to use device's keyboard+screen or this usbtty serial console over USB.
Signed-off-by: Pali Rohár pali@kernel.org
Changes since v1:
- Fixed USB product id and product name
- Disabled some other options to free more space
- Changes now passed CI tests: https://dev.azure.com/u-boot/u-boot/_build/results?buildId=1492&view=res...
Note that this patch depends on other Nokia RX-51 patches which are on mailing list, otherwise CI tests do not pass:
https://patchwork.ozlabs.org/project/uboot/patch/20201121223011.14262-1-pali... https://patchwork.ozlabs.org/project/uboot/patch/20201121223317.14347-1-pali... https://patchwork.ozlabs.org/project/uboot/patch/20201129161505.5092-1-pali@... https://patchwork.ozlabs.org/project/uboot/patch/20201130191034.795-1-pali@k...
okay, Ill wait for all these patches to get merged, before I pick this patch.
Web pages for all these patches is saying:
State: Under Review Delegated to: Lokesh Vutla
So I think these patches are also waiting for you.
The main patch I need is this[0]. Without this I am getting a build failure as you mentioned in the commit description. So, Until [0] patch is applied I cannot apply this patch. Since you combined disabling of other configs in the same patch, it is causing my pipeline failure.
Can you split the disabling of other configs into a separate patch so that others are unblocked?
[0] https://patchwork.ozlabs.org/project/uboot/patch/20201130192715.1793-1-pali@...
ahh copy paste issues: [0] https://patchwork.ozlabs.org/project/uboot/patch/20201129164618.5829-3-pali@...
Thanks and regards, Lokesh
Sorry missed this.
Thanks and regards, Lokesh
Thanks and regards, Lokesh
Thanks and regards, Lokesh
configs/nokia_rx51_defconfig | 8 +++++--- doc/README.nokia_rx51 | 15 +-------------- include/configs/nokia_rx51.h | 21 +++++++-------------- 3 files changed, 13 insertions(+), 31 deletions(-)
diff --git a/configs/nokia_rx51_defconfig b/configs/nokia_rx51_defconfig index 0f05fe6fc3..963dd145ce 100644 --- a/configs/nokia_rx51_defconfig +++ b/configs/nokia_rx51_defconfig @@ -44,18 +44,16 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=onenand:128k(bootloader)ro,384k(config),256k(l CONFIG_ENV_OVERWRITE=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y # CONFIG_NET is not set -CONFIG_TWL4030_LED=y # CONFIG_MMC_HW_PARTITIONING is not set +# CONFIG_MMC_VERBOSE is not set CONFIG_MMC_OMAP_HS=y CONFIG_MTD=y CONFIG_CONS_INDEX=3 CONFIG_SYS_NS16550=y CONFIG_SPI=y CONFIG_USB=y -CONFIG_USB_MUSB_HCD=y CONFIG_USB_MUSB_UDC=y CONFIG_USB_OMAP3=y -CONFIG_TWL4030_USB=y CONFIG_CFB_CONSOLE=y CONFIG_CFB_CONSOLE_ANSI=y # CONFIG_VGA_AS_SINGLE_DEVICE is not set @@ -66,3 +64,7 @@ CONFIG_DM_I2C=y CONFIG_DM_MMC=y # CONFIG_DM_DEVICE_REMOVE is not set # CONFIG_SYS_MALLOC_F is not set +# CONFIG_DM_WARN is not set +# CONFIG_DM_SEQ_ALIAS is not set +# CONFIG_BLOCK_CACHE is not set +# CONFIG_SYS_DEVICE_NULLDEV is not set diff --git a/doc/README.nokia_rx51 b/doc/README.nokia_rx51 index 320b5efc7d..84d1912ddd 100644 --- a/doc/README.nokia_rx51 +++ b/doc/README.nokia_rx51 @@ -24,8 +24,7 @@ called u-boot-gen-combined. It is available in following repository: There is support for hardware watchdog. Hardware watchdog is started by NOLO so u-boot must kick watchdog to prevent reboot device (but not very often, max every 2 seconds). There is also support for framebuffer display -output with ANSI escape codes and the N900 HW keyboard input. USB tty works -but is disabled because it prevents the current Maemo kernel from booting. +output with ANSI escape codes and the N900 HW keyboard input.
When U-Boot is starting it enable IBE bit in Auxiliary Control Register, which is needed for Thumb-2 ISA support. It is workaround for errata 430973. @@ -49,10 +48,6 @@ Boot from SD or eMMC in this order:
Available additional commands/variables:
- run sercon - Use serial port for control
- run usbcon - Use usbtty for control
- run vgacon - Use framebuffer and HW keyboard for control (default)
- run sdboot - Boot from external SD card (see boot order)
- run emmcboot - Boot from internal eMMC memory (see boot order)
- run attachboot - Boot attached kernel image (attached to U-Boot binary)
@@ -87,14 +82,6 @@ Additional variables for booting kernel: and u-boot standard output is set to serial then setup_console_atag is automatically set to 1. So output from Maemo kernel would go to serial port.
-USB TTY:
- Maemo kernel 2.6.28 will crash if u-boot enable usb tty. So USB TTY is disabled.
- For enabling USB TTY just add this line to file include/configs/nokia_rx51.h
- #define CONFIG_USB_TTY
UBIFS support:
UBIFS support is disabled, because U-Boot image is too big and cannot be diff --git a/include/configs/nokia_rx51.h b/include/configs/nokia_rx51.h index 3f2700d8e2..23368de624 100644 --- a/include/configs/nokia_rx51.h +++ b/include/configs/nokia_rx51.h @@ -70,10 +70,12 @@
/* USB device configuration */ #define CONFIG_USB_DEVICE +#define CONFIG_USB_TTY #define CONFIG_USBD_VENDORID 0x0421 -#define CONFIG_USBD_PRODUCTID 0x01c8 +#define CONFIG_USBD_PRODUCTID_CDCACM 0x01c8 +#define CONFIG_USBD_PRODUCTID_GSERIAL 0x01c8 #define CONFIG_USBD_MANUFACTURER "Nokia" -#define CONFIG_USBD_PRODUCT_NAME "N900" +#define CONFIG_USBD_PRODUCT_NAME "N900 (U-Boot)"
#define GPIO_SLIDE 71
@@ -108,15 +110,9 @@ int rx51_kp_getc(struct stdio_dev *sdev); /* Environment information */ #define CONFIG_EXTRA_ENV_SETTINGS \ "usbtty=cdc_acm\0" \
- "stdin=serial,vga\0" \
- "stdout=serial,vga\0" \
- "stderr=serial,vga\0" \
- "setcon=setenv stdin ${con};" \
"setenv stdout ${con};" \"setenv stderr ${con}\0" \- "sercon=setenv con serial; run setcon\0" \
- "usbcon=setenv con usbtty; run setcon\0" \
- "vgacon=setenv con vga; run setcon\0" \
- "stdin=usbtty,serial,vga\0" \
- "stdout=usbtty,serial,vga\0" \
- "stderr=usbtty,serial,vga\0" \ "slide=gpio input " __stringify(GPIO_SLIDE) "\0" \ "switchmmc=mmc dev ${mmcnum}\0" \ "kernaddr=0x82008000\0" \
@@ -198,9 +194,6 @@ int rx51_kp_getc(struct stdio_dev *sdev); #define CONFIG_POSTBOOTMENU \ "echo;" \ "echo Extra commands:;" \
- "echo run sercon - Use serial port for control.;" \
- "echo run usbcon - Use usbtty for control.;" \
- "echo run vgacon - Use framebuffer/keyboard.;" \ "echo run sdboot - Boot from SD card slot.;" \ "echo run emmcboot - Boot internal eMMC memory.;" \ "echo run attachboot - Boot attached kernel image.;" \
On Tuesday 22 December 2020 20:39:11 Lokesh Vutla wrote:
On 22/12/20 8:38 pm, Lokesh Vutla wrote:
On 22/12/20 8:36 pm, Lokesh Vutla wrote:
On 22/12/20 8:28 pm, Pali Rohár wrote:
On Tuesday 22 December 2020 19:56:51 Lokesh Vutla wrote:
On 01/12/20 12:57 am, Pali Rohár wrote:
Now when usbtty serial console is fixed in U-Boot enable CONFIG_USB_TTY for Nokia RX-51 board by default.
Fix also USB product id as U-Boot ignores CONFIG_USBD_PRODUCTID macro and include U-Boot string into USB product name to indicate usage of U-Boot.
CONFIG_CONSOLE_MUX is already used and U-Boot console is available for all in/out devices. Therefore there is no need to have separate commands 'run sercon', 'run usbcon' and 'run vgacon', so remove them.
As space for U-Boot is limited to 256kB, disable some other unused options so CONFIG_USB_TTY can be enabled.
Nokia RX-51 does not have easily accessible UART serial console so the only option for easy debugging is to use device's keyboard+screen or this usbtty serial console over USB.
Signed-off-by: Pali Rohár pali@kernel.org
Changes since v1:
- Fixed USB product id and product name
- Disabled some other options to free more space
- Changes now passed CI tests: https://dev.azure.com/u-boot/u-boot/_build/results?buildId=1492&view=res...
Note that this patch depends on other Nokia RX-51 patches which are on mailing list, otherwise CI tests do not pass:
https://patchwork.ozlabs.org/project/uboot/patch/20201121223011.14262-1-pali... https://patchwork.ozlabs.org/project/uboot/patch/20201121223317.14347-1-pali... https://patchwork.ozlabs.org/project/uboot/patch/20201129161505.5092-1-pali@... https://patchwork.ozlabs.org/project/uboot/patch/20201130191034.795-1-pali@k...
okay, Ill wait for all these patches to get merged, before I pick this patch.
Web pages for all these patches is saying:
State: Under Review Delegated to: Lokesh Vutla
So I think these patches are also waiting for you.
The main patch I need is this[0]. Without this I am getting a build failure as you mentioned in the commit description. So, Until [0] patch is applied I cannot apply this patch. Since you combined disabling of other configs in the same patch, it is causing my pipeline failure.
Can you split the disabling of other configs into a separate patch so that others are unblocked?
[0] https://patchwork.ozlabs.org/project/uboot/patch/20201130192715.1793-1-pali@...
ahh copy paste issues: [0] https://patchwork.ozlabs.org/project/uboot/patch/20201129164618.5829-3-pali@...
Sorry, now I'm somehow lost.
All patches are in my git repository git://github.com/pali/u-boot.git in branch nokia-rx51. And this branch passed pipeline checks.
It took me some time to prepare all patches in state that after applying all of them whole pipeline pass.
As this starting to be complicated, could you please tell me which commit/patch either needs to be modified or if needed how to change order of them?
Thanks and regards, Lokesh
Sorry missed this.
Thanks and regards, Lokesh
Thanks and regards, Lokesh
Thanks and regards, Lokesh
configs/nokia_rx51_defconfig | 8 +++++--- doc/README.nokia_rx51 | 15 +-------------- include/configs/nokia_rx51.h | 21 +++++++-------------- 3 files changed, 13 insertions(+), 31 deletions(-)
diff --git a/configs/nokia_rx51_defconfig b/configs/nokia_rx51_defconfig index 0f05fe6fc3..963dd145ce 100644 --- a/configs/nokia_rx51_defconfig +++ b/configs/nokia_rx51_defconfig @@ -44,18 +44,16 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=onenand:128k(bootloader)ro,384k(config),256k(l CONFIG_ENV_OVERWRITE=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y # CONFIG_NET is not set -CONFIG_TWL4030_LED=y # CONFIG_MMC_HW_PARTITIONING is not set +# CONFIG_MMC_VERBOSE is not set CONFIG_MMC_OMAP_HS=y CONFIG_MTD=y CONFIG_CONS_INDEX=3 CONFIG_SYS_NS16550=y CONFIG_SPI=y CONFIG_USB=y -CONFIG_USB_MUSB_HCD=y CONFIG_USB_MUSB_UDC=y CONFIG_USB_OMAP3=y -CONFIG_TWL4030_USB=y CONFIG_CFB_CONSOLE=y CONFIG_CFB_CONSOLE_ANSI=y # CONFIG_VGA_AS_SINGLE_DEVICE is not set @@ -66,3 +64,7 @@ CONFIG_DM_I2C=y CONFIG_DM_MMC=y # CONFIG_DM_DEVICE_REMOVE is not set # CONFIG_SYS_MALLOC_F is not set +# CONFIG_DM_WARN is not set +# CONFIG_DM_SEQ_ALIAS is not set +# CONFIG_BLOCK_CACHE is not set +# CONFIG_SYS_DEVICE_NULLDEV is not set diff --git a/doc/README.nokia_rx51 b/doc/README.nokia_rx51 index 320b5efc7d..84d1912ddd 100644 --- a/doc/README.nokia_rx51 +++ b/doc/README.nokia_rx51 @@ -24,8 +24,7 @@ called u-boot-gen-combined. It is available in following repository: There is support for hardware watchdog. Hardware watchdog is started by NOLO so u-boot must kick watchdog to prevent reboot device (but not very often, max every 2 seconds). There is also support for framebuffer display -output with ANSI escape codes and the N900 HW keyboard input. USB tty works -but is disabled because it prevents the current Maemo kernel from booting. +output with ANSI escape codes and the N900 HW keyboard input.
When U-Boot is starting it enable IBE bit in Auxiliary Control Register, which is needed for Thumb-2 ISA support. It is workaround for errata 430973. @@ -49,10 +48,6 @@ Boot from SD or eMMC in this order:
Available additional commands/variables:
- run sercon - Use serial port for control
- run usbcon - Use usbtty for control
- run vgacon - Use framebuffer and HW keyboard for control (default)
- run sdboot - Boot from external SD card (see boot order)
- run emmcboot - Boot from internal eMMC memory (see boot order)
- run attachboot - Boot attached kernel image (attached to U-Boot binary)
@@ -87,14 +82,6 @@ Additional variables for booting kernel: and u-boot standard output is set to serial then setup_console_atag is automatically set to 1. So output from Maemo kernel would go to serial port.
-USB TTY:
- Maemo kernel 2.6.28 will crash if u-boot enable usb tty. So USB TTY is disabled.
- For enabling USB TTY just add this line to file include/configs/nokia_rx51.h
- #define CONFIG_USB_TTY
UBIFS support:
UBIFS support is disabled, because U-Boot image is too big and cannot be diff --git a/include/configs/nokia_rx51.h b/include/configs/nokia_rx51.h index 3f2700d8e2..23368de624 100644 --- a/include/configs/nokia_rx51.h +++ b/include/configs/nokia_rx51.h @@ -70,10 +70,12 @@
/* USB device configuration */ #define CONFIG_USB_DEVICE +#define CONFIG_USB_TTY #define CONFIG_USBD_VENDORID 0x0421 -#define CONFIG_USBD_PRODUCTID 0x01c8 +#define CONFIG_USBD_PRODUCTID_CDCACM 0x01c8 +#define CONFIG_USBD_PRODUCTID_GSERIAL 0x01c8 #define CONFIG_USBD_MANUFACTURER "Nokia" -#define CONFIG_USBD_PRODUCT_NAME "N900" +#define CONFIG_USBD_PRODUCT_NAME "N900 (U-Boot)"
#define GPIO_SLIDE 71
@@ -108,15 +110,9 @@ int rx51_kp_getc(struct stdio_dev *sdev); /* Environment information */ #define CONFIG_EXTRA_ENV_SETTINGS \ "usbtty=cdc_acm\0" \
- "stdin=serial,vga\0" \
- "stdout=serial,vga\0" \
- "stderr=serial,vga\0" \
- "setcon=setenv stdin ${con};" \
"setenv stdout ${con};" \"setenv stderr ${con}\0" \- "sercon=setenv con serial; run setcon\0" \
- "usbcon=setenv con usbtty; run setcon\0" \
- "vgacon=setenv con vga; run setcon\0" \
- "stdin=usbtty,serial,vga\0" \
- "stdout=usbtty,serial,vga\0" \
- "stderr=usbtty,serial,vga\0" \ "slide=gpio input " __stringify(GPIO_SLIDE) "\0" \ "switchmmc=mmc dev ${mmcnum}\0" \ "kernaddr=0x82008000\0" \
@@ -198,9 +194,6 @@ int rx51_kp_getc(struct stdio_dev *sdev); #define CONFIG_POSTBOOTMENU \ "echo;" \ "echo Extra commands:;" \
- "echo run sercon - Use serial port for control.;" \
- "echo run usbcon - Use usbtty for control.;" \
- "echo run vgacon - Use framebuffer/keyboard.;" \ "echo run sdboot - Boot from SD card slot.;" \ "echo run emmcboot - Boot internal eMMC memory.;" \ "echo run attachboot - Boot attached kernel image.;" \
On 22/12/20 8:47 pm, Pali Rohár wrote:
On Tuesday 22 December 2020 20:39:11 Lokesh Vutla wrote:
On 22/12/20 8:38 pm, Lokesh Vutla wrote:
On 22/12/20 8:36 pm, Lokesh Vutla wrote:
On 22/12/20 8:28 pm, Pali Rohár wrote:
On Tuesday 22 December 2020 19:56:51 Lokesh Vutla wrote:
On 01/12/20 12:57 am, Pali Rohár wrote: > Now when usbtty serial console is fixed in U-Boot enable CONFIG_USB_TTY for > Nokia RX-51 board by default. > > Fix also USB product id as U-Boot ignores CONFIG_USBD_PRODUCTID macro and > include U-Boot string into USB product name to indicate usage of U-Boot. > > CONFIG_CONSOLE_MUX is already used and U-Boot console is available for > all in/out devices. Therefore there is no need to have separate commands > 'run sercon', 'run usbcon' and 'run vgacon', so remove them. > > As space for U-Boot is limited to 256kB, disable some other unused options > so CONFIG_USB_TTY can be enabled. > > Nokia RX-51 does not have easily accessible UART serial console so the only > option for easy debugging is to use device's keyboard+screen or this usbtty > serial console over USB. > > Signed-off-by: Pali Rohár pali@kernel.org > --- > Changes since v1: > * Fixed USB product id and product name > * Disabled some other options to free more space > * Changes now passed CI tests: > https://dev.azure.com/u-boot/u-boot/_build/results?buildId=1492&view=res... > > Note that this patch depends on other Nokia RX-51 patches which are on > mailing list, otherwise CI tests do not pass: > > https://patchwork.ozlabs.org/project/uboot/patch/20201121223011.14262-1-pali... > https://patchwork.ozlabs.org/project/uboot/patch/20201121223317.14347-1-pali... > https://patchwork.ozlabs.org/project/uboot/patch/20201129161505.5092-1-pali@... > https://patchwork.ozlabs.org/project/uboot/patch/20201130191034.795-1-pali@k...
okay, Ill wait for all these patches to get merged, before I pick this patch.
Web pages for all these patches is saying:
State: Under Review Delegated to: Lokesh Vutla
So I think these patches are also waiting for you.
The main patch I need is this[0]. Without this I am getting a build failure as you mentioned in the commit description. So, Until [0] patch is applied I cannot apply this patch. Since you combined disabling of other configs in the same patch, it is causing my pipeline failure.
Can you split the disabling of other configs into a separate patch so that others are unblocked?
[0] https://patchwork.ozlabs.org/project/uboot/patch/20201130192715.1793-1-pali@...
ahh copy paste issues: [0] https://patchwork.ozlabs.org/project/uboot/patch/20201129164618.5829-3-pali@...
Sorry, now I'm somehow lost.
All patches are in my git repository git://github.com/pali/u-boot.git in branch nokia-rx51. And this branch passed pipeline checks.
Yeah because there is a usb patch that is not in my queue which is fixing build issues.
Let me give more details. Below are the patches that are in my queue:
[v2] Nokia RX-51: Enable usbtty serial console by default Nokia RX-51: Do not try calling both ext2load and ext4load Nokia RX-51: Add test for U-Boot serial console Nokia RX-51: Nokia RX-51: Convert to CONFIG_DM_MMC Nokia RX-51: Decrease i2c speed to 100000
Issue1: If I apply all these patches I get this build error https://pastebin.ubuntu.com/p/R7P6z8RJJZ/
When I saw you queue, the patch [0] is fixing the build error. But it[0] is assigned to Marek. So I bisecting the error to $patch and dropped it from my queue for now.
Issue2: After applying the below 4 patches, I see the Gitlab pipeline error[1]. Nokia RX-51: Do not try calling both ext2load and ext4load Nokia RX-51: Add test for U-Boot serial console Nokia RX-51: Nokia RX-51: Convert to CONFIG_DM_MMC Nokia RX-51: Decrease i2c speed to 100000
This error[1] can be solved by disabling unnecessary configs like the ones you disabled in $patch +# CONFIG_DM_WARN is not set +# CONFIG_DM_SEQ_ALIAS is not set +# CONFIG_BLOCK_CACHE is not set +# CONFIG_SYS_DEVICE_NULLDEV is not set
I am asking to send the above as a separate patch so that the 4 patches can be un blocked. Hope this is clear.
[0] https://patchwork.ozlabs.org/project/uboot/patch/20201129164618.5829-3-pali@... [1] https://gitlab.denx.de/u-boot/custodians/u-boot-ti/-/jobs/192532
Thanks and regards, Lokesh
It took me some time to prepare all patches in state that after applying all of them whole pipeline pass.
As this starting to be complicated, could you please tell me which commit/patch either needs to be modified or if needed how to change order of them?
Thanks and regards, Lokesh
Sorry missed this.
Thanks and regards, Lokesh
Thanks and regards, Lokesh
Thanks and regards, Lokesh
> --- > configs/nokia_rx51_defconfig | 8 +++++--- > doc/README.nokia_rx51 | 15 +-------------- > include/configs/nokia_rx51.h | 21 +++++++-------------- > 3 files changed, 13 insertions(+), 31 deletions(-) > > diff --git a/configs/nokia_rx51_defconfig b/configs/nokia_rx51_defconfig > index 0f05fe6fc3..963dd145ce 100644 > --- a/configs/nokia_rx51_defconfig > +++ b/configs/nokia_rx51_defconfig > @@ -44,18 +44,16 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=onenand:128k(bootloader)ro,384k(config),256k(l > CONFIG_ENV_OVERWRITE=y > CONFIG_SYS_RELOC_GD_ENV_ADDR=y > # CONFIG_NET is not set > -CONFIG_TWL4030_LED=y > # CONFIG_MMC_HW_PARTITIONING is not set > +# CONFIG_MMC_VERBOSE is not set > CONFIG_MMC_OMAP_HS=y > CONFIG_MTD=y > CONFIG_CONS_INDEX=3 > CONFIG_SYS_NS16550=y > CONFIG_SPI=y > CONFIG_USB=y > -CONFIG_USB_MUSB_HCD=y > CONFIG_USB_MUSB_UDC=y > CONFIG_USB_OMAP3=y > -CONFIG_TWL4030_USB=y > CONFIG_CFB_CONSOLE=y > CONFIG_CFB_CONSOLE_ANSI=y > # CONFIG_VGA_AS_SINGLE_DEVICE is not set > @@ -66,3 +64,7 @@ CONFIG_DM_I2C=y > CONFIG_DM_MMC=y > # CONFIG_DM_DEVICE_REMOVE is not set > # CONFIG_SYS_MALLOC_F is not set > +# CONFIG_DM_WARN is not set > +# CONFIG_DM_SEQ_ALIAS is not set > +# CONFIG_BLOCK_CACHE is not set > +# CONFIG_SYS_DEVICE_NULLDEV is not set > diff --git a/doc/README.nokia_rx51 b/doc/README.nokia_rx51 > index 320b5efc7d..84d1912ddd 100644 > --- a/doc/README.nokia_rx51 > +++ b/doc/README.nokia_rx51 > @@ -24,8 +24,7 @@ called u-boot-gen-combined. It is available in following repository: > There is support for hardware watchdog. Hardware watchdog is started by > NOLO so u-boot must kick watchdog to prevent reboot device (but not very > often, max every 2 seconds). There is also support for framebuffer display > -output with ANSI escape codes and the N900 HW keyboard input. USB tty works > -but is disabled because it prevents the current Maemo kernel from booting. > +output with ANSI escape codes and the N900 HW keyboard input. > > When U-Boot is starting it enable IBE bit in Auxiliary Control Register, > which is needed for Thumb-2 ISA support. It is workaround for errata 430973. > @@ -49,10 +48,6 @@ Boot from SD or eMMC in this order: > > Available additional commands/variables: > > - * run sercon - Use serial port for control > - * run usbcon - Use usbtty for control > - * run vgacon - Use framebuffer and HW keyboard for control (default) > - > * run sdboot - Boot from external SD card (see boot order) > * run emmcboot - Boot from internal eMMC memory (see boot order) > * run attachboot - Boot attached kernel image (attached to U-Boot binary) > @@ -87,14 +82,6 @@ Additional variables for booting kernel: > and u-boot standard output is set to serial then setup_console_atag is > automatically set to 1. So output from Maemo kernel would go to serial port. > > -USB TTY: > - > - Maemo kernel 2.6.28 will crash if u-boot enable usb tty. So USB TTY is disabled. > - For enabling USB TTY just add this line to file include/configs/nokia_rx51.h > - > - #define CONFIG_USB_TTY > - > - > UBIFS support: > > UBIFS support is disabled, because U-Boot image is too big and cannot be > diff --git a/include/configs/nokia_rx51.h b/include/configs/nokia_rx51.h > index 3f2700d8e2..23368de624 100644 > --- a/include/configs/nokia_rx51.h > +++ b/include/configs/nokia_rx51.h > @@ -70,10 +70,12 @@ > > /* USB device configuration */ > #define CONFIG_USB_DEVICE > +#define CONFIG_USB_TTY > #define CONFIG_USBD_VENDORID 0x0421 > -#define CONFIG_USBD_PRODUCTID 0x01c8 > +#define CONFIG_USBD_PRODUCTID_CDCACM 0x01c8 > +#define CONFIG_USBD_PRODUCTID_GSERIAL 0x01c8 > #define CONFIG_USBD_MANUFACTURER "Nokia" > -#define CONFIG_USBD_PRODUCT_NAME "N900" > +#define CONFIG_USBD_PRODUCT_NAME "N900 (U-Boot)" > > #define GPIO_SLIDE 71 > > @@ -108,15 +110,9 @@ int rx51_kp_getc(struct stdio_dev *sdev); > /* Environment information */ > #define CONFIG_EXTRA_ENV_SETTINGS \ > "usbtty=cdc_acm\0" \ > - "stdin=serial,vga\0" \ > - "stdout=serial,vga\0" \ > - "stderr=serial,vga\0" \ > - "setcon=setenv stdin ${con};" \ > - "setenv stdout ${con};" \ > - "setenv stderr ${con}\0" \ > - "sercon=setenv con serial; run setcon\0" \ > - "usbcon=setenv con usbtty; run setcon\0" \ > - "vgacon=setenv con vga; run setcon\0" \ > + "stdin=usbtty,serial,vga\0" \ > + "stdout=usbtty,serial,vga\0" \ > + "stderr=usbtty,serial,vga\0" \ > "slide=gpio input " __stringify(GPIO_SLIDE) "\0" \ > "switchmmc=mmc dev ${mmcnum}\0" \ > "kernaddr=0x82008000\0" \ > @@ -198,9 +194,6 @@ int rx51_kp_getc(struct stdio_dev *sdev); > #define CONFIG_POSTBOOTMENU \ > "echo;" \ > "echo Extra commands:;" \ > - "echo run sercon - Use serial port for control.;" \ > - "echo run usbcon - Use usbtty for control.;" \ > - "echo run vgacon - Use framebuffer/keyboard.;" \ > "echo run sdboot - Boot from SD card slot.;" \ > "echo run emmcboot - Boot internal eMMC memory.;" \ > "echo run attachboot - Boot attached kernel image.;" \ >
On Tuesday 22 December 2020 21:08:45 Lokesh Vutla wrote:
On 22/12/20 8:47 pm, Pali Rohár wrote:
On Tuesday 22 December 2020 20:39:11 Lokesh Vutla wrote:
On 22/12/20 8:38 pm, Lokesh Vutla wrote:
On 22/12/20 8:36 pm, Lokesh Vutla wrote:
On 22/12/20 8:28 pm, Pali Rohár wrote:
On Tuesday 22 December 2020 19:56:51 Lokesh Vutla wrote: > > > On 01/12/20 12:57 am, Pali Rohár wrote: >> Now when usbtty serial console is fixed in U-Boot enable CONFIG_USB_TTY for >> Nokia RX-51 board by default. >> >> Fix also USB product id as U-Boot ignores CONFIG_USBD_PRODUCTID macro and >> include U-Boot string into USB product name to indicate usage of U-Boot. >> >> CONFIG_CONSOLE_MUX is already used and U-Boot console is available for >> all in/out devices. Therefore there is no need to have separate commands >> 'run sercon', 'run usbcon' and 'run vgacon', so remove them. >> >> As space for U-Boot is limited to 256kB, disable some other unused options >> so CONFIG_USB_TTY can be enabled. >> >> Nokia RX-51 does not have easily accessible UART serial console so the only >> option for easy debugging is to use device's keyboard+screen or this usbtty >> serial console over USB. >> >> Signed-off-by: Pali Rohár pali@kernel.org >> --- >> Changes since v1: >> * Fixed USB product id and product name >> * Disabled some other options to free more space >> * Changes now passed CI tests: >> https://dev.azure.com/u-boot/u-boot/_build/results?buildId=1492&view=res... >> >> Note that this patch depends on other Nokia RX-51 patches which are on >> mailing list, otherwise CI tests do not pass: >> >> https://patchwork.ozlabs.org/project/uboot/patch/20201121223011.14262-1-pali... >> https://patchwork.ozlabs.org/project/uboot/patch/20201121223317.14347-1-pali... >> https://patchwork.ozlabs.org/project/uboot/patch/20201129161505.5092-1-pali@... >> https://patchwork.ozlabs.org/project/uboot/patch/20201130191034.795-1-pali@k... > > okay, Ill wait for all these patches to get merged, before I pick this patch.
Web pages for all these patches is saying:
State: Under Review Delegated to: Lokesh Vutla
So I think these patches are also waiting for you.
The main patch I need is this[0]. Without this I am getting a build failure as you mentioned in the commit description. So, Until [0] patch is applied I cannot apply this patch. Since you combined disabling of other configs in the same patch, it is causing my pipeline failure.
Can you split the disabling of other configs into a separate patch so that others are unblocked?
[0] https://patchwork.ozlabs.org/project/uboot/patch/20201130192715.1793-1-pali@...
ahh copy paste issues: [0] https://patchwork.ozlabs.org/project/uboot/patch/20201129164618.5829-3-pali@...
Sorry, now I'm somehow lost.
All patches are in my git repository git://github.com/pali/u-boot.git in branch nokia-rx51. And this branch passed pipeline checks.
Yeah because there is a usb patch that is not in my queue which is fixing build issues.
Let me give more details. Below are the patches that are in my queue:
[v2] Nokia RX-51: Enable usbtty serial console by default Nokia RX-51: Do not try calling both ext2load and ext4load Nokia RX-51: Add test for U-Boot serial console Nokia RX-51: Nokia RX-51: Convert to CONFIG_DM_MMC Nokia RX-51: Decrease i2c speed to 100000
Issue1: If I apply all these patches I get this build error https://pastebin.ubuntu.com/p/R7P6z8RJJZ/
When I saw you queue, the patch [0] is fixing the build error. But it[0] is assigned to Marek. So I bisecting the error to $patch and dropped it from my queue for now.
Ok. Now I see what you are trying. Problem that all those patches needs to be applied in order as they are in my git tree.
So if you have dropped some of those patches (like you wrote) it is expected to see failures.
Issue2: After applying the below 4 patches, I see the Gitlab pipeline error[1]. Nokia RX-51: Do not try calling both ext2load and ext4load Nokia RX-51: Add test for U-Boot serial console Nokia RX-51: Nokia RX-51: Convert to CONFIG_DM_MMC Nokia RX-51: Decrease i2c speed to 100000
This error[1] can be solved by disabling unnecessary configs like the ones you disabled in $patch +# CONFIG_DM_WARN is not set +# CONFIG_DM_SEQ_ALIAS is not set +# CONFIG_BLOCK_CACHE is not set +# CONFIG_SYS_DEVICE_NULLDEV is not set
I am asking to send the above as a separate patch so that the 4 patches can be un blocked. Hope this is clear.
Ok. I can do it, if it helps. But re-arranging and splitting patches into different form just more complicate things. Therefore it would be easier if all those patches (which accumulated for months) could be reviewed and applied in "verified" order.
[0] https://patchwork.ozlabs.org/project/uboot/patch/20201129164618.5829-3-pali@... [1] https://gitlab.denx.de/u-boot/custodians/u-boot-ti/-/jobs/192532
Thanks and regards, Lokesh
It took me some time to prepare all patches in state that after applying all of them whole pipeline pass.
As this starting to be complicated, could you please tell me which commit/patch either needs to be modified or if needed how to change order of them?
Thanks and regards, Lokesh
Sorry missed this.
Thanks and regards, Lokesh
Thanks and regards, Lokesh
> Thanks and regards, > Lokesh > >> --- >> configs/nokia_rx51_defconfig | 8 +++++--- >> doc/README.nokia_rx51 | 15 +-------------- >> include/configs/nokia_rx51.h | 21 +++++++-------------- >> 3 files changed, 13 insertions(+), 31 deletions(-) >> >> diff --git a/configs/nokia_rx51_defconfig b/configs/nokia_rx51_defconfig >> index 0f05fe6fc3..963dd145ce 100644 >> --- a/configs/nokia_rx51_defconfig >> +++ b/configs/nokia_rx51_defconfig >> @@ -44,18 +44,16 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=onenand:128k(bootloader)ro,384k(config),256k(l >> CONFIG_ENV_OVERWRITE=y >> CONFIG_SYS_RELOC_GD_ENV_ADDR=y >> # CONFIG_NET is not set >> -CONFIG_TWL4030_LED=y >> # CONFIG_MMC_HW_PARTITIONING is not set >> +# CONFIG_MMC_VERBOSE is not set >> CONFIG_MMC_OMAP_HS=y >> CONFIG_MTD=y >> CONFIG_CONS_INDEX=3 >> CONFIG_SYS_NS16550=y >> CONFIG_SPI=y >> CONFIG_USB=y >> -CONFIG_USB_MUSB_HCD=y >> CONFIG_USB_MUSB_UDC=y >> CONFIG_USB_OMAP3=y >> -CONFIG_TWL4030_USB=y >> CONFIG_CFB_CONSOLE=y >> CONFIG_CFB_CONSOLE_ANSI=y >> # CONFIG_VGA_AS_SINGLE_DEVICE is not set >> @@ -66,3 +64,7 @@ CONFIG_DM_I2C=y >> CONFIG_DM_MMC=y >> # CONFIG_DM_DEVICE_REMOVE is not set >> # CONFIG_SYS_MALLOC_F is not set >> +# CONFIG_DM_WARN is not set >> +# CONFIG_DM_SEQ_ALIAS is not set >> +# CONFIG_BLOCK_CACHE is not set >> +# CONFIG_SYS_DEVICE_NULLDEV is not set >> diff --git a/doc/README.nokia_rx51 b/doc/README.nokia_rx51 >> index 320b5efc7d..84d1912ddd 100644 >> --- a/doc/README.nokia_rx51 >> +++ b/doc/README.nokia_rx51 >> @@ -24,8 +24,7 @@ called u-boot-gen-combined. It is available in following repository: >> There is support for hardware watchdog. Hardware watchdog is started by >> NOLO so u-boot must kick watchdog to prevent reboot device (but not very >> often, max every 2 seconds). There is also support for framebuffer display >> -output with ANSI escape codes and the N900 HW keyboard input. USB tty works >> -but is disabled because it prevents the current Maemo kernel from booting. >> +output with ANSI escape codes and the N900 HW keyboard input. >> >> When U-Boot is starting it enable IBE bit in Auxiliary Control Register, >> which is needed for Thumb-2 ISA support. It is workaround for errata 430973. >> @@ -49,10 +48,6 @@ Boot from SD or eMMC in this order: >> >> Available additional commands/variables: >> >> - * run sercon - Use serial port for control >> - * run usbcon - Use usbtty for control >> - * run vgacon - Use framebuffer and HW keyboard for control (default) >> - >> * run sdboot - Boot from external SD card (see boot order) >> * run emmcboot - Boot from internal eMMC memory (see boot order) >> * run attachboot - Boot attached kernel image (attached to U-Boot binary) >> @@ -87,14 +82,6 @@ Additional variables for booting kernel: >> and u-boot standard output is set to serial then setup_console_atag is >> automatically set to 1. So output from Maemo kernel would go to serial port. >> >> -USB TTY: >> - >> - Maemo kernel 2.6.28 will crash if u-boot enable usb tty. So USB TTY is disabled. >> - For enabling USB TTY just add this line to file include/configs/nokia_rx51.h >> - >> - #define CONFIG_USB_TTY >> - >> - >> UBIFS support: >> >> UBIFS support is disabled, because U-Boot image is too big and cannot be >> diff --git a/include/configs/nokia_rx51.h b/include/configs/nokia_rx51.h >> index 3f2700d8e2..23368de624 100644 >> --- a/include/configs/nokia_rx51.h >> +++ b/include/configs/nokia_rx51.h >> @@ -70,10 +70,12 @@ >> >> /* USB device configuration */ >> #define CONFIG_USB_DEVICE >> +#define CONFIG_USB_TTY >> #define CONFIG_USBD_VENDORID 0x0421 >> -#define CONFIG_USBD_PRODUCTID 0x01c8 >> +#define CONFIG_USBD_PRODUCTID_CDCACM 0x01c8 >> +#define CONFIG_USBD_PRODUCTID_GSERIAL 0x01c8 >> #define CONFIG_USBD_MANUFACTURER "Nokia" >> -#define CONFIG_USBD_PRODUCT_NAME "N900" >> +#define CONFIG_USBD_PRODUCT_NAME "N900 (U-Boot)" >> >> #define GPIO_SLIDE 71 >> >> @@ -108,15 +110,9 @@ int rx51_kp_getc(struct stdio_dev *sdev); >> /* Environment information */ >> #define CONFIG_EXTRA_ENV_SETTINGS \ >> "usbtty=cdc_acm\0" \ >> - "stdin=serial,vga\0" \ >> - "stdout=serial,vga\0" \ >> - "stderr=serial,vga\0" \ >> - "setcon=setenv stdin ${con};" \ >> - "setenv stdout ${con};" \ >> - "setenv stderr ${con}\0" \ >> - "sercon=setenv con serial; run setcon\0" \ >> - "usbcon=setenv con usbtty; run setcon\0" \ >> - "vgacon=setenv con vga; run setcon\0" \ >> + "stdin=usbtty,serial,vga\0" \ >> + "stdout=usbtty,serial,vga\0" \ >> + "stderr=usbtty,serial,vga\0" \ >> "slide=gpio input " __stringify(GPIO_SLIDE) "\0" \ >> "switchmmc=mmc dev ${mmcnum}\0" \ >> "kernaddr=0x82008000\0" \ >> @@ -198,9 +194,6 @@ int rx51_kp_getc(struct stdio_dev *sdev); >> #define CONFIG_POSTBOOTMENU \ >> "echo;" \ >> "echo Extra commands:;" \ >> - "echo run sercon - Use serial port for control.;" \ >> - "echo run usbcon - Use usbtty for control.;" \ >> - "echo run vgacon - Use framebuffer/keyboard.;" \ >> "echo run sdboot - Boot from SD card slot.;" \ >> "echo run emmcboot - Boot internal eMMC memory.;" \ >> "echo run attachboot - Boot attached kernel image.;" \ >>
On 22/12/20 9:32 pm, Pali Rohár wrote:
On Tuesday 22 December 2020 21:08:45 Lokesh Vutla wrote:
On 22/12/20 8:47 pm, Pali Rohár wrote:
On Tuesday 22 December 2020 20:39:11 Lokesh Vutla wrote:
On 22/12/20 8:38 pm, Lokesh Vutla wrote:
On 22/12/20 8:36 pm, Lokesh Vutla wrote:
On 22/12/20 8:28 pm, Pali Rohár wrote: > On Tuesday 22 December 2020 19:56:51 Lokesh Vutla wrote: >> >> >> On 01/12/20 12:57 am, Pali Rohár wrote: >>> Now when usbtty serial console is fixed in U-Boot enable CONFIG_USB_TTY for >>> Nokia RX-51 board by default. >>> >>> Fix also USB product id as U-Boot ignores CONFIG_USBD_PRODUCTID macro and >>> include U-Boot string into USB product name to indicate usage of U-Boot. >>> >>> CONFIG_CONSOLE_MUX is already used and U-Boot console is available for >>> all in/out devices. Therefore there is no need to have separate commands >>> 'run sercon', 'run usbcon' and 'run vgacon', so remove them. >>> >>> As space for U-Boot is limited to 256kB, disable some other unused options >>> so CONFIG_USB_TTY can be enabled. >>> >>> Nokia RX-51 does not have easily accessible UART serial console so the only >>> option for easy debugging is to use device's keyboard+screen or this usbtty >>> serial console over USB. >>> >>> Signed-off-by: Pali Rohár pali@kernel.org >>> --- >>> Changes since v1: >>> * Fixed USB product id and product name >>> * Disabled some other options to free more space >>> * Changes now passed CI tests: >>> https://dev.azure.com/u-boot/u-boot/_build/results?buildId=1492&view=res... >>> >>> Note that this patch depends on other Nokia RX-51 patches which are on >>> mailing list, otherwise CI tests do not pass: >>> >>> https://patchwork.ozlabs.org/project/uboot/patch/20201121223011.14262-1-pali... >>> https://patchwork.ozlabs.org/project/uboot/patch/20201121223317.14347-1-pali... >>> https://patchwork.ozlabs.org/project/uboot/patch/20201129161505.5092-1-pali@... >>> https://patchwork.ozlabs.org/project/uboot/patch/20201130191034.795-1-pali@k... >> >> okay, Ill wait for all these patches to get merged, before I pick this patch. > > Web pages for all these patches is saying: > > State: Under Review > Delegated to: Lokesh Vutla > > So I think these patches are also waiting for you.
The main patch I need is this[0]. Without this I am getting a build failure as you mentioned in the commit description. So, Until [0] patch is applied I cannot apply this patch. Since you combined disabling of other configs in the same patch, it is causing my pipeline failure.
Can you split the disabling of other configs into a separate patch so that others are unblocked?
[0] https://patchwork.ozlabs.org/project/uboot/patch/20201130192715.1793-1-pali@...
ahh copy paste issues: [0] https://patchwork.ozlabs.org/project/uboot/patch/20201129164618.5829-3-pali@...
Sorry, now I'm somehow lost.
All patches are in my git repository git://github.com/pali/u-boot.git in branch nokia-rx51. And this branch passed pipeline checks.
Yeah because there is a usb patch that is not in my queue which is fixing build issues.
Let me give more details. Below are the patches that are in my queue:
[v2] Nokia RX-51: Enable usbtty serial console by default Nokia RX-51: Do not try calling both ext2load and ext4load Nokia RX-51: Add test for U-Boot serial console Nokia RX-51: Nokia RX-51: Convert to CONFIG_DM_MMC Nokia RX-51: Decrease i2c speed to 100000
Issue1: If I apply all these patches I get this build error https://pastebin.ubuntu.com/p/R7P6z8RJJZ/
When I saw you queue, the patch [0] is fixing the build error. But it[0] is assigned to Marek. So I bisecting the error to $patch and dropped it from my queue for now.
Ok. Now I see what you are trying. Problem that all those patches needs to be applied in order as they are in my git tree.
So if you have dropped some of those patches (like you wrote) it is expected to see failures.
Issue2: After applying the below 4 patches, I see the Gitlab pipeline error[1]. Nokia RX-51: Do not try calling both ext2load and ext4load Nokia RX-51: Add test for U-Boot serial console Nokia RX-51: Nokia RX-51: Convert to CONFIG_DM_MMC Nokia RX-51: Decrease i2c speed to 100000
This error[1] can be solved by disabling unnecessary configs like the ones you disabled in $patch +# CONFIG_DM_WARN is not set +# CONFIG_DM_SEQ_ALIAS is not set +# CONFIG_BLOCK_CACHE is not set +# CONFIG_SYS_DEVICE_NULLDEV is not set
I am asking to send the above as a separate patch so that the 4 patches can be un blocked. Hope this is clear.
Ok. I can do it, if it helps. But re-arranging and splitting patches into different form just more complicate things. Therefore it would be easier if all those patches (which accumulated for months) could be reviewed and applied in "verified" order.
Unfortunately I cannot merge usb patches. It should go via usb subsystem tree, I can only pull platform port patches. If you can split it up, it will unblock the 4 patches at least.
Thanks and regards, Lokesh
[0] https://patchwork.ozlabs.org/project/uboot/patch/20201129164618.5829-3-pali@... [1] https://gitlab.denx.de/u-boot/custodians/u-boot-ti/-/jobs/192532
Thanks and regards, Lokesh
It took me some time to prepare all patches in state that after applying all of them whole pipeline pass.
As this starting to be complicated, could you please tell me which commit/patch either needs to be modified or if needed how to change order of them?
Thanks and regards, Lokesh
Sorry missed this.
Thanks and regards, Lokesh
Thanks and regards, Lokesh
> >> Thanks and regards, >> Lokesh >> >>> --- >>> configs/nokia_rx51_defconfig | 8 +++++--- >>> doc/README.nokia_rx51 | 15 +-------------- >>> include/configs/nokia_rx51.h | 21 +++++++-------------- >>> 3 files changed, 13 insertions(+), 31 deletions(-) >>> >>> diff --git a/configs/nokia_rx51_defconfig b/configs/nokia_rx51_defconfig >>> index 0f05fe6fc3..963dd145ce 100644 >>> --- a/configs/nokia_rx51_defconfig >>> +++ b/configs/nokia_rx51_defconfig >>> @@ -44,18 +44,16 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=onenand:128k(bootloader)ro,384k(config),256k(l >>> CONFIG_ENV_OVERWRITE=y >>> CONFIG_SYS_RELOC_GD_ENV_ADDR=y >>> # CONFIG_NET is not set >>> -CONFIG_TWL4030_LED=y >>> # CONFIG_MMC_HW_PARTITIONING is not set >>> +# CONFIG_MMC_VERBOSE is not set >>> CONFIG_MMC_OMAP_HS=y >>> CONFIG_MTD=y >>> CONFIG_CONS_INDEX=3 >>> CONFIG_SYS_NS16550=y >>> CONFIG_SPI=y >>> CONFIG_USB=y >>> -CONFIG_USB_MUSB_HCD=y >>> CONFIG_USB_MUSB_UDC=y >>> CONFIG_USB_OMAP3=y >>> -CONFIG_TWL4030_USB=y >>> CONFIG_CFB_CONSOLE=y >>> CONFIG_CFB_CONSOLE_ANSI=y >>> # CONFIG_VGA_AS_SINGLE_DEVICE is not set >>> @@ -66,3 +64,7 @@ CONFIG_DM_I2C=y >>> CONFIG_DM_MMC=y >>> # CONFIG_DM_DEVICE_REMOVE is not set >>> # CONFIG_SYS_MALLOC_F is not set >>> +# CONFIG_DM_WARN is not set >>> +# CONFIG_DM_SEQ_ALIAS is not set >>> +# CONFIG_BLOCK_CACHE is not set >>> +# CONFIG_SYS_DEVICE_NULLDEV is not set >>> diff --git a/doc/README.nokia_rx51 b/doc/README.nokia_rx51 >>> index 320b5efc7d..84d1912ddd 100644 >>> --- a/doc/README.nokia_rx51 >>> +++ b/doc/README.nokia_rx51 >>> @@ -24,8 +24,7 @@ called u-boot-gen-combined. It is available in following repository: >>> There is support for hardware watchdog. Hardware watchdog is started by >>> NOLO so u-boot must kick watchdog to prevent reboot device (but not very >>> often, max every 2 seconds). There is also support for framebuffer display >>> -output with ANSI escape codes and the N900 HW keyboard input. USB tty works >>> -but is disabled because it prevents the current Maemo kernel from booting. >>> +output with ANSI escape codes and the N900 HW keyboard input. >>> >>> When U-Boot is starting it enable IBE bit in Auxiliary Control Register, >>> which is needed for Thumb-2 ISA support. It is workaround for errata 430973. >>> @@ -49,10 +48,6 @@ Boot from SD or eMMC in this order: >>> >>> Available additional commands/variables: >>> >>> - * run sercon - Use serial port for control >>> - * run usbcon - Use usbtty for control >>> - * run vgacon - Use framebuffer and HW keyboard for control (default) >>> - >>> * run sdboot - Boot from external SD card (see boot order) >>> * run emmcboot - Boot from internal eMMC memory (see boot order) >>> * run attachboot - Boot attached kernel image (attached to U-Boot binary) >>> @@ -87,14 +82,6 @@ Additional variables for booting kernel: >>> and u-boot standard output is set to serial then setup_console_atag is >>> automatically set to 1. So output from Maemo kernel would go to serial port. >>> >>> -USB TTY: >>> - >>> - Maemo kernel 2.6.28 will crash if u-boot enable usb tty. So USB TTY is disabled. >>> - For enabling USB TTY just add this line to file include/configs/nokia_rx51.h >>> - >>> - #define CONFIG_USB_TTY >>> - >>> - >>> UBIFS support: >>> >>> UBIFS support is disabled, because U-Boot image is too big and cannot be >>> diff --git a/include/configs/nokia_rx51.h b/include/configs/nokia_rx51.h >>> index 3f2700d8e2..23368de624 100644 >>> --- a/include/configs/nokia_rx51.h >>> +++ b/include/configs/nokia_rx51.h >>> @@ -70,10 +70,12 @@ >>> >>> /* USB device configuration */ >>> #define CONFIG_USB_DEVICE >>> +#define CONFIG_USB_TTY >>> #define CONFIG_USBD_VENDORID 0x0421 >>> -#define CONFIG_USBD_PRODUCTID 0x01c8 >>> +#define CONFIG_USBD_PRODUCTID_CDCACM 0x01c8 >>> +#define CONFIG_USBD_PRODUCTID_GSERIAL 0x01c8 >>> #define CONFIG_USBD_MANUFACTURER "Nokia" >>> -#define CONFIG_USBD_PRODUCT_NAME "N900" >>> +#define CONFIG_USBD_PRODUCT_NAME "N900 (U-Boot)" >>> >>> #define GPIO_SLIDE 71 >>> >>> @@ -108,15 +110,9 @@ int rx51_kp_getc(struct stdio_dev *sdev); >>> /* Environment information */ >>> #define CONFIG_EXTRA_ENV_SETTINGS \ >>> "usbtty=cdc_acm\0" \ >>> - "stdin=serial,vga\0" \ >>> - "stdout=serial,vga\0" \ >>> - "stderr=serial,vga\0" \ >>> - "setcon=setenv stdin ${con};" \ >>> - "setenv stdout ${con};" \ >>> - "setenv stderr ${con}\0" \ >>> - "sercon=setenv con serial; run setcon\0" \ >>> - "usbcon=setenv con usbtty; run setcon\0" \ >>> - "vgacon=setenv con vga; run setcon\0" \ >>> + "stdin=usbtty,serial,vga\0" \ >>> + "stdout=usbtty,serial,vga\0" \ >>> + "stderr=usbtty,serial,vga\0" \ >>> "slide=gpio input " __stringify(GPIO_SLIDE) "\0" \ >>> "switchmmc=mmc dev ${mmcnum}\0" \ >>> "kernaddr=0x82008000\0" \ >>> @@ -198,9 +194,6 @@ int rx51_kp_getc(struct stdio_dev *sdev); >>> #define CONFIG_POSTBOOTMENU \ >>> "echo;" \ >>> "echo Extra commands:;" \ >>> - "echo run sercon - Use serial port for control.;" \ >>> - "echo run usbcon - Use usbtty for control.;" \ >>> - "echo run vgacon - Use framebuffer/keyboard.;" \ >>> "echo run sdboot - Boot from SD card slot.;" \ >>> "echo run emmcboot - Boot internal eMMC memory.;" \ >>> "echo run attachboot - Boot attached kernel image.;" \ >>>
On Wednesday 23 December 2020 11:35:10 Lokesh Vutla wrote:
On 22/12/20 9:32 pm, Pali Rohár wrote:
On Tuesday 22 December 2020 21:08:45 Lokesh Vutla wrote:
On 22/12/20 8:47 pm, Pali Rohár wrote:
On Tuesday 22 December 2020 20:39:11 Lokesh Vutla wrote:
On 22/12/20 8:38 pm, Lokesh Vutla wrote:
On 22/12/20 8:36 pm, Lokesh Vutla wrote: > > > On 22/12/20 8:28 pm, Pali Rohár wrote: >> On Tuesday 22 December 2020 19:56:51 Lokesh Vutla wrote: >>> >>> >>> On 01/12/20 12:57 am, Pali Rohár wrote: >>>> Now when usbtty serial console is fixed in U-Boot enable CONFIG_USB_TTY for >>>> Nokia RX-51 board by default. >>>> >>>> Fix also USB product id as U-Boot ignores CONFIG_USBD_PRODUCTID macro and >>>> include U-Boot string into USB product name to indicate usage of U-Boot. >>>> >>>> CONFIG_CONSOLE_MUX is already used and U-Boot console is available for >>>> all in/out devices. Therefore there is no need to have separate commands >>>> 'run sercon', 'run usbcon' and 'run vgacon', so remove them. >>>> >>>> As space for U-Boot is limited to 256kB, disable some other unused options >>>> so CONFIG_USB_TTY can be enabled. >>>> >>>> Nokia RX-51 does not have easily accessible UART serial console so the only >>>> option for easy debugging is to use device's keyboard+screen or this usbtty >>>> serial console over USB. >>>> >>>> Signed-off-by: Pali Rohár pali@kernel.org >>>> --- >>>> Changes since v1: >>>> * Fixed USB product id and product name >>>> * Disabled some other options to free more space >>>> * Changes now passed CI tests: >>>> https://dev.azure.com/u-boot/u-boot/_build/results?buildId=1492&view=res... >>>> >>>> Note that this patch depends on other Nokia RX-51 patches which are on >>>> mailing list, otherwise CI tests do not pass: >>>> >>>> https://patchwork.ozlabs.org/project/uboot/patch/20201121223011.14262-1-pali... >>>> https://patchwork.ozlabs.org/project/uboot/patch/20201121223317.14347-1-pali... >>>> https://patchwork.ozlabs.org/project/uboot/patch/20201129161505.5092-1-pali@... >>>> https://patchwork.ozlabs.org/project/uboot/patch/20201130191034.795-1-pali@k... >>> >>> okay, Ill wait for all these patches to get merged, before I pick this patch. >> >> Web pages for all these patches is saying: >> >> State: Under Review >> Delegated to: Lokesh Vutla >> >> So I think these patches are also waiting for you. > > The main patch I need is this[0]. Without this I am getting a build failure as > you mentioned in the commit description. So, Until [0] patch is applied I cannot > apply this patch. Since you combined disabling of other configs in the same > patch, it is causing my pipeline failure. > > Can you split the disabling of other configs into a separate patch so that > others are unblocked?
[0] https://patchwork.ozlabs.org/project/uboot/patch/20201130192715.1793-1-pali@...
ahh copy paste issues: [0] https://patchwork.ozlabs.org/project/uboot/patch/20201129164618.5829-3-pali@...
Sorry, now I'm somehow lost.
All patches are in my git repository git://github.com/pali/u-boot.git in branch nokia-rx51. And this branch passed pipeline checks.
Yeah because there is a usb patch that is not in my queue which is fixing build issues.
Let me give more details. Below are the patches that are in my queue:
[v2] Nokia RX-51: Enable usbtty serial console by default Nokia RX-51: Do not try calling both ext2load and ext4load Nokia RX-51: Add test for U-Boot serial console Nokia RX-51: Nokia RX-51: Convert to CONFIG_DM_MMC Nokia RX-51: Decrease i2c speed to 100000
Issue1: If I apply all these patches I get this build error https://pastebin.ubuntu.com/p/R7P6z8RJJZ/
When I saw you queue, the patch [0] is fixing the build error. But it[0] is assigned to Marek. So I bisecting the error to $patch and dropped it from my queue for now.
Ok. Now I see what you are trying. Problem that all those patches needs to be applied in order as they are in my git tree.
So if you have dropped some of those patches (like you wrote) it is expected to see failures.
Issue2: After applying the below 4 patches, I see the Gitlab pipeline error[1]. Nokia RX-51: Do not try calling both ext2load and ext4load Nokia RX-51: Add test for U-Boot serial console Nokia RX-51: Nokia RX-51: Convert to CONFIG_DM_MMC Nokia RX-51: Decrease i2c speed to 100000
This error[1] can be solved by disabling unnecessary configs like the ones you disabled in $patch +# CONFIG_DM_WARN is not set +# CONFIG_DM_SEQ_ALIAS is not set +# CONFIG_BLOCK_CACHE is not set +# CONFIG_SYS_DEVICE_NULLDEV is not set
I am asking to send the above as a separate patch so that the 4 patches can be un blocked. Hope this is clear.
Ok. I can do it, if it helps. But re-arranging and splitting patches into different form just more complicate things. Therefore it would be easier if all those patches (which accumulated for months) could be reviewed and applied in "verified" order.
Unfortunately I cannot merge usb patches. It should go via usb subsystem tree, I can only pull platform port patches. If you can split it up, it will unblock the 4 patches at least.
I played a bit with it and on my machine/setup disabling option CONFIG_MMC_VERBOSE in patch "Nokia RX-51: Convert to CONFIG_DM_MMC" helped.
Could you try adding following line into configs/nokia_rx51_defconfig?
# CONFIG_MMC_VERBOSE is not set
Thanks and regards, Lokesh
[0] https://patchwork.ozlabs.org/project/uboot/patch/20201129164618.5829-3-pali@... [1] https://gitlab.denx.de/u-boot/custodians/u-boot-ti/-/jobs/192532
Thanks and regards, Lokesh
It took me some time to prepare all patches in state that after applying all of them whole pipeline pass.
As this starting to be complicated, could you please tell me which commit/patch either needs to be modified or if needed how to change order of them?
Thanks and regards, Lokesh
Sorry missed this.
Thanks and regards, Lokesh
> > Thanks and regards, > Lokesh > >> >>> Thanks and regards, >>> Lokesh >>> >>>> --- >>>> configs/nokia_rx51_defconfig | 8 +++++--- >>>> doc/README.nokia_rx51 | 15 +-------------- >>>> include/configs/nokia_rx51.h | 21 +++++++-------------- >>>> 3 files changed, 13 insertions(+), 31 deletions(-) >>>> >>>> diff --git a/configs/nokia_rx51_defconfig b/configs/nokia_rx51_defconfig >>>> index 0f05fe6fc3..963dd145ce 100644 >>>> --- a/configs/nokia_rx51_defconfig >>>> +++ b/configs/nokia_rx51_defconfig >>>> @@ -44,18 +44,16 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=onenand:128k(bootloader)ro,384k(config),256k(l >>>> CONFIG_ENV_OVERWRITE=y >>>> CONFIG_SYS_RELOC_GD_ENV_ADDR=y >>>> # CONFIG_NET is not set >>>> -CONFIG_TWL4030_LED=y >>>> # CONFIG_MMC_HW_PARTITIONING is not set >>>> +# CONFIG_MMC_VERBOSE is not set >>>> CONFIG_MMC_OMAP_HS=y >>>> CONFIG_MTD=y >>>> CONFIG_CONS_INDEX=3 >>>> CONFIG_SYS_NS16550=y >>>> CONFIG_SPI=y >>>> CONFIG_USB=y >>>> -CONFIG_USB_MUSB_HCD=y >>>> CONFIG_USB_MUSB_UDC=y >>>> CONFIG_USB_OMAP3=y >>>> -CONFIG_TWL4030_USB=y >>>> CONFIG_CFB_CONSOLE=y >>>> CONFIG_CFB_CONSOLE_ANSI=y >>>> # CONFIG_VGA_AS_SINGLE_DEVICE is not set >>>> @@ -66,3 +64,7 @@ CONFIG_DM_I2C=y >>>> CONFIG_DM_MMC=y >>>> # CONFIG_DM_DEVICE_REMOVE is not set >>>> # CONFIG_SYS_MALLOC_F is not set >>>> +# CONFIG_DM_WARN is not set >>>> +# CONFIG_DM_SEQ_ALIAS is not set >>>> +# CONFIG_BLOCK_CACHE is not set >>>> +# CONFIG_SYS_DEVICE_NULLDEV is not set >>>> diff --git a/doc/README.nokia_rx51 b/doc/README.nokia_rx51 >>>> index 320b5efc7d..84d1912ddd 100644 >>>> --- a/doc/README.nokia_rx51 >>>> +++ b/doc/README.nokia_rx51 >>>> @@ -24,8 +24,7 @@ called u-boot-gen-combined. It is available in following repository: >>>> There is support for hardware watchdog. Hardware watchdog is started by >>>> NOLO so u-boot must kick watchdog to prevent reboot device (but not very >>>> often, max every 2 seconds). There is also support for framebuffer display >>>> -output with ANSI escape codes and the N900 HW keyboard input. USB tty works >>>> -but is disabled because it prevents the current Maemo kernel from booting. >>>> +output with ANSI escape codes and the N900 HW keyboard input. >>>> >>>> When U-Boot is starting it enable IBE bit in Auxiliary Control Register, >>>> which is needed for Thumb-2 ISA support. It is workaround for errata 430973. >>>> @@ -49,10 +48,6 @@ Boot from SD or eMMC in this order: >>>> >>>> Available additional commands/variables: >>>> >>>> - * run sercon - Use serial port for control >>>> - * run usbcon - Use usbtty for control >>>> - * run vgacon - Use framebuffer and HW keyboard for control (default) >>>> - >>>> * run sdboot - Boot from external SD card (see boot order) >>>> * run emmcboot - Boot from internal eMMC memory (see boot order) >>>> * run attachboot - Boot attached kernel image (attached to U-Boot binary) >>>> @@ -87,14 +82,6 @@ Additional variables for booting kernel: >>>> and u-boot standard output is set to serial then setup_console_atag is >>>> automatically set to 1. So output from Maemo kernel would go to serial port. >>>> >>>> -USB TTY: >>>> - >>>> - Maemo kernel 2.6.28 will crash if u-boot enable usb tty. So USB TTY is disabled. >>>> - For enabling USB TTY just add this line to file include/configs/nokia_rx51.h >>>> - >>>> - #define CONFIG_USB_TTY >>>> - >>>> - >>>> UBIFS support: >>>> >>>> UBIFS support is disabled, because U-Boot image is too big and cannot be >>>> diff --git a/include/configs/nokia_rx51.h b/include/configs/nokia_rx51.h >>>> index 3f2700d8e2..23368de624 100644 >>>> --- a/include/configs/nokia_rx51.h >>>> +++ b/include/configs/nokia_rx51.h >>>> @@ -70,10 +70,12 @@ >>>> >>>> /* USB device configuration */ >>>> #define CONFIG_USB_DEVICE >>>> +#define CONFIG_USB_TTY >>>> #define CONFIG_USBD_VENDORID 0x0421 >>>> -#define CONFIG_USBD_PRODUCTID 0x01c8 >>>> +#define CONFIG_USBD_PRODUCTID_CDCACM 0x01c8 >>>> +#define CONFIG_USBD_PRODUCTID_GSERIAL 0x01c8 >>>> #define CONFIG_USBD_MANUFACTURER "Nokia" >>>> -#define CONFIG_USBD_PRODUCT_NAME "N900" >>>> +#define CONFIG_USBD_PRODUCT_NAME "N900 (U-Boot)" >>>> >>>> #define GPIO_SLIDE 71 >>>> >>>> @@ -108,15 +110,9 @@ int rx51_kp_getc(struct stdio_dev *sdev); >>>> /* Environment information */ >>>> #define CONFIG_EXTRA_ENV_SETTINGS \ >>>> "usbtty=cdc_acm\0" \ >>>> - "stdin=serial,vga\0" \ >>>> - "stdout=serial,vga\0" \ >>>> - "stderr=serial,vga\0" \ >>>> - "setcon=setenv stdin ${con};" \ >>>> - "setenv stdout ${con};" \ >>>> - "setenv stderr ${con}\0" \ >>>> - "sercon=setenv con serial; run setcon\0" \ >>>> - "usbcon=setenv con usbtty; run setcon\0" \ >>>> - "vgacon=setenv con vga; run setcon\0" \ >>>> + "stdin=usbtty,serial,vga\0" \ >>>> + "stdout=usbtty,serial,vga\0" \ >>>> + "stderr=usbtty,serial,vga\0" \ >>>> "slide=gpio input " __stringify(GPIO_SLIDE) "\0" \ >>>> "switchmmc=mmc dev ${mmcnum}\0" \ >>>> "kernaddr=0x82008000\0" \ >>>> @@ -198,9 +194,6 @@ int rx51_kp_getc(struct stdio_dev *sdev); >>>> #define CONFIG_POSTBOOTMENU \ >>>> "echo;" \ >>>> "echo Extra commands:;" \ >>>> - "echo run sercon - Use serial port for control.;" \ >>>> - "echo run usbcon - Use usbtty for control.;" \ >>>> - "echo run vgacon - Use framebuffer/keyboard.;" \ >>>> "echo run sdboot - Boot from SD card slot.;" \ >>>> "echo run emmcboot - Boot internal eMMC memory.;" \ >>>> "echo run attachboot - Boot attached kernel image.;" \ >>>>
On Sun, Nov 29, 2020 at 6:53 PM Pali Rohár pali@kernel.org wrote:
Now when usbtty serial console is fixed in U-Boot enable it for Nokia RX-51 board by default.
CONFIG_CONSOLE_MUX is already used and U-Boot console is available for all in/out devices. Therefore there is no need to have separate commands 'run sercon', 'run usbcon' and 'run vgacon', so remove them.
As space for U-Boot is limited to 256kB, disable some other unused options so CONFIG_USB_TTY can be enabled.
Nokia RX-51 does not have easily accessible UART serial console so the only option for easy debugging is to use device's keyboard+screen or this usbtty serial console over USB.
I think it's not a good idea to revive usbtty. I was recently playing around f_serial.c (I can send you the half baked stuff, which by a lot of twisted code in DWC3 driver is not working properly, actually almost not working) and I think that would be the right thing to do.
usbtty quite old, intrusive way of serial console via USB supported only by outdated hardware (like this Nokia N-900), while f_serial gotta work on better recent base. And I believe musb should be, if needed, patched to support composite devices.
So, kinda disagreement from my side as a summary on this. But disclaimer, I'm not a maintainer here, just my 2 cents.
On Sunday 27 December 2020 18:28:25 Andy Shevchenko wrote:
On Sun, Nov 29, 2020 at 6:53 PM Pali Rohár pali@kernel.org wrote:
Now when usbtty serial console is fixed in U-Boot enable it for Nokia RX-51 board by default.
CONFIG_CONSOLE_MUX is already used and U-Boot console is available for all in/out devices. Therefore there is no need to have separate commands 'run sercon', 'run usbcon' and 'run vgacon', so remove them.
As space for U-Boot is limited to 256kB, disable some other unused options so CONFIG_USB_TTY can be enabled.
Nokia RX-51 does not have easily accessible UART serial console so the only option for easy debugging is to use device's keyboard+screen or this usbtty serial console over USB.
I think it's not a good idea to revive usbtty.
Well, but u-boot does not support anything else for Nokia N900. And main issues here are musb bugs which this patch series is fixing. For debugging is serial console (e.g. usbtty) needed.
I was recently playing around f_serial.c (I can send you the half baked stuff, which by a lot of twisted code in DWC3 driver is not working properly, actually almost not working) and I think that would be the right thing to do.
usbtty quite old, intrusive way of serial console via USB supported only by outdated hardware (like this Nokia N-900), while f_serial gotta work on better recent base. And I believe musb should be, if needed, patched to support composite devices.
So, kinda disagreement from my side as a summary on this. But disclaimer, I'm not a maintainer here, just my 2 cents.
-- With Best Regards, Andy Shevchenko
On Sun, Dec 27, 2020 at 6:35 PM Pali Rohár pali@kernel.org wrote:
On Sunday 27 December 2020 18:28:25 Andy Shevchenko wrote:
On Sun, Nov 29, 2020 at 6:53 PM Pali Rohár pali@kernel.org wrote:
Now when usbtty serial console is fixed in U-Boot enable it for Nokia RX-51 board by default.
CONFIG_CONSOLE_MUX is already used and U-Boot console is available for all in/out devices. Therefore there is no need to have separate commands 'run sercon', 'run usbcon' and 'run vgacon', so remove them.
As space for U-Boot is limited to 256kB, disable some other unused options so CONFIG_USB_TTY can be enabled.
Nokia RX-51 does not have easily accessible UART serial console so the only option for easy debugging is to use device's keyboard+screen or this usbtty serial console over USB.
I think it's not a good idea to revive usbtty.
Well, but u-boot does not support anything else for Nokia N900. And main issues here are musb bugs which this patch series is fixing. For debugging is serial console (e.g. usbtty) needed.
I'm not against musb fixes, I'm against promoting usbtty. Why composite + f_serial can't be used for that?
I was recently playing around f_serial.c (I can send you the half baked stuff, which by a lot of twisted code in DWC3 driver is not working properly, actually almost not working) and I think that would be the right thing to do.
usbtty quite old, intrusive way of serial console via USB supported only by outdated hardware (like this Nokia N-900), while f_serial gotta work on better recent base. And I believe musb should be, if needed, patched to support composite devices.
So, kinda disagreement from my side as a summary on this. But disclaimer, I'm not a maintainer here, just my 2 cents.
On Sunday 27 December 2020 18:42:19 Andy Shevchenko wrote:
On Sun, Dec 27, 2020 at 6:35 PM Pali Rohár pali@kernel.org wrote:
On Sunday 27 December 2020 18:28:25 Andy Shevchenko wrote:
On Sun, Nov 29, 2020 at 6:53 PM Pali Rohár pali@kernel.org wrote:
Now when usbtty serial console is fixed in U-Boot enable it for Nokia RX-51 board by default.
CONFIG_CONSOLE_MUX is already used and U-Boot console is available for all in/out devices. Therefore there is no need to have separate commands 'run sercon', 'run usbcon' and 'run vgacon', so remove them.
As space for U-Boot is limited to 256kB, disable some other unused options so CONFIG_USB_TTY can be enabled.
Nokia RX-51 does not have easily accessible UART serial console so the only option for easy debugging is to use device's keyboard+screen or this usbtty serial console over USB.
I think it's not a good idea to revive usbtty.
Well, but u-boot does not support anything else for Nokia N900. And main issues here are musb bugs which this patch series is fixing. For debugging is serial console (e.g. usbtty) needed.
I'm not against musb fixes, I'm against promoting usbtty. Why composite + f_serial can't be used for that?
Because nobody looked at it and invested time in it. usbtty was there for a long time and is working fine right now (with these musb patches).
I was recently playing around f_serial.c (I can send you the half baked stuff, which by a lot of twisted code in DWC3 driver is not working properly, actually almost not working) and I think that would be the right thing to do.
usbtty quite old, intrusive way of serial console via USB supported only by outdated hardware (like this Nokia N-900), while f_serial gotta work on better recent base. And I believe musb should be, if needed, patched to support composite devices.
So, kinda disagreement from my side as a summary on this. But disclaimer, I'm not a maintainer here, just my 2 cents.
-- With Best Regards, Andy Shevchenko
Hello Lokesh, could you please process this patch series? USB serial console on Nokia N900 is really useful for debugging and currently in U-Boot master code is broken. Pavel has already reviewed patches and also CI tests passed.
On Sunday 29 November 2020 17:46:05 Pali Rohár wrote:
This patch series fix usbtty code (serial console via USB peripheral mode), fix underlying musb peripheral code, fix compilation of CONFIG_USB_DEVICE (used by usbtty), remove unused Nokia RX-51 code to decrease size of U-Boot binary and finally enable usbtty serial console for Nokia RX-51.
With this patch series debugging of Nokia RX-51 can be done also via USB serial console.
On computer this serial console is accessible via /dev/ttyACM0 device.
With current implementation there is an issue in musb driver that it loose receiving bytes from USB bus when too many a characters are send over USB tty from computer. Typing on keyboard to kermit terminal connected to /dev/ttyACM0 is working fine. But pasting more more bytes to terminal cause data lost on receiving side. I do not know where is the issue or how to fix it (it looks like that data are lost at low level when reading them from msub FIFO hardware) but typing on keyboard is working fine. This is rather issue for sending files via x/y/z-modem or kermit protocol. Currently U-Boot is not able to receive any file via usbtty with musb driver due to this issue.
Pali Rohár (13): serial: usbtty: Fix puts function usb: musb: Fix compilation of gadget code usb: musb: Always clear the data toggle bit when configuring ep usb: musb: Fix configuring FIFO for endpoints usb: musb: Read value of PERI_RXCSR to 16bit variable usb: musb: Fix transmission of bigger buffers usb: gadget: Do not export usbd_device_* arrays usb: gadget: Use dbg_ep0() macro instead of serial_printf() arm: omap3: Compile lowlevel_init() function only when it is used arm: omap3: Compile s_init() function only when it is used Nokia RX-51: Remove function set_muxconf_regs() Nokia RX-51: Move content of rx51.h to rx51.c Nokia RX-51: Enable usbtty serial console by default
Makefile | 1 + arch/arm/mach-omap2/omap3/board.c | 3 + arch/arm/mach-omap2/omap3/lowlevel_init.S | 6 +- board/nokia/rx51/rx51.c | 28 +- board/nokia/rx51/rx51.h | 377 ---------------------- configs/nokia_rx51_defconfig | 6 +- doc/README.nokia_rx51 | 15 +- drivers/serial/usbtty.c | 4 +- drivers/usb/gadget/core.c | 38 +-- drivers/usb/gadget/ep0.c | 47 ++- drivers/usb/musb/musb_core.c | 10 +- drivers/usb/musb/musb_udc.c | 19 +- include/configs/nokia_rx51.h | 16 +- include/usbdevice.h | 15 - 14 files changed, 92 insertions(+), 493 deletions(-) delete mode 100644 board/nokia/rx51/rx51.h
-- 2.20.1
Hi Pali,
On 11/12/20 1:31 am, Pali Rohár wrote:
Hello Lokesh, could you please process this patch series? USB serial console on Nokia N900 is really useful for debugging and currently in U-Boot master code is broken. Pavel has already reviewed patches and also CI tests passed.
I am out of office from past 3 weeks and will be back on Monday. Will try to get to this series early next week. Sorry for the delayed response.
Thanks and regards, Lokesh
On Sunday 29 November 2020 17:46:05 Pali Rohár wrote:
This patch series fix usbtty code (serial console via USB peripheral mode), fix underlying musb peripheral code, fix compilation of CONFIG_USB_DEVICE (used by usbtty), remove unused Nokia RX-51 code to decrease size of U-Boot binary and finally enable usbtty serial console for Nokia RX-51.
With this patch series debugging of Nokia RX-51 can be done also via USB serial console.
On computer this serial console is accessible via /dev/ttyACM0 device.
With current implementation there is an issue in musb driver that it loose receiving bytes from USB bus when too many a characters are send over USB tty from computer. Typing on keyboard to kermit terminal connected to /dev/ttyACM0 is working fine. But pasting more more bytes to terminal cause data lost on receiving side. I do not know where is the issue or how to fix it (it looks like that data are lost at low level when reading them from msub FIFO hardware) but typing on keyboard is working fine. This is rather issue for sending files via x/y/z-modem or kermit protocol. Currently U-Boot is not able to receive any file via usbtty with musb driver due to this issue.
Pali Rohár (13): serial: usbtty: Fix puts function usb: musb: Fix compilation of gadget code usb: musb: Always clear the data toggle bit when configuring ep usb: musb: Fix configuring FIFO for endpoints usb: musb: Read value of PERI_RXCSR to 16bit variable usb: musb: Fix transmission of bigger buffers usb: gadget: Do not export usbd_device_* arrays usb: gadget: Use dbg_ep0() macro instead of serial_printf() arm: omap3: Compile lowlevel_init() function only when it is used arm: omap3: Compile s_init() function only when it is used Nokia RX-51: Remove function set_muxconf_regs() Nokia RX-51: Move content of rx51.h to rx51.c Nokia RX-51: Enable usbtty serial console by default
Makefile | 1 + arch/arm/mach-omap2/omap3/board.c | 3 + arch/arm/mach-omap2/omap3/lowlevel_init.S | 6 +- board/nokia/rx51/rx51.c | 28 +- board/nokia/rx51/rx51.h | 377 ---------------------- configs/nokia_rx51_defconfig | 6 +- doc/README.nokia_rx51 | 15 +- drivers/serial/usbtty.c | 4 +- drivers/usb/gadget/core.c | 38 +-- drivers/usb/gadget/ep0.c | 47 ++- drivers/usb/musb/musb_core.c | 10 +- drivers/usb/musb/musb_udc.c | 19 +- include/configs/nokia_rx51.h | 16 +- include/usbdevice.h | 15 - 14 files changed, 92 insertions(+), 493 deletions(-) delete mode 100644 board/nokia/rx51/rx51.h
-- 2.20.1
On Friday 11 December 2020 16:23:50 Lokesh Vutla wrote:
Hi Pali,
On 11/12/20 1:31 am, Pali Rohár wrote:
Hello Lokesh, could you please process this patch series? USB serial console on Nokia N900 is really useful for debugging and currently in U-Boot master code is broken. Pavel has already reviewed patches and also CI tests passed.
I am out of office from past 3 weeks and will be back on Monday. Will try to get to this series early next week. Sorry for the delayed response.
Ok! Let me know then if there are any issues in these patches.
Thanks and regards, Lokesh
On Sunday 29 November 2020 17:46:05 Pali Rohár wrote:
This patch series fix usbtty code (serial console via USB peripheral mode), fix underlying musb peripheral code, fix compilation of CONFIG_USB_DEVICE (used by usbtty), remove unused Nokia RX-51 code to decrease size of U-Boot binary and finally enable usbtty serial console for Nokia RX-51.
With this patch series debugging of Nokia RX-51 can be done also via USB serial console.
On computer this serial console is accessible via /dev/ttyACM0 device.
With current implementation there is an issue in musb driver that it loose receiving bytes from USB bus when too many a characters are send over USB tty from computer. Typing on keyboard to kermit terminal connected to /dev/ttyACM0 is working fine. But pasting more more bytes to terminal cause data lost on receiving side. I do not know where is the issue or how to fix it (it looks like that data are lost at low level when reading them from msub FIFO hardware) but typing on keyboard is working fine. This is rather issue for sending files via x/y/z-modem or kermit protocol. Currently U-Boot is not able to receive any file via usbtty with musb driver due to this issue.
Pali Rohár (13): serial: usbtty: Fix puts function usb: musb: Fix compilation of gadget code usb: musb: Always clear the data toggle bit when configuring ep usb: musb: Fix configuring FIFO for endpoints usb: musb: Read value of PERI_RXCSR to 16bit variable usb: musb: Fix transmission of bigger buffers usb: gadget: Do not export usbd_device_* arrays usb: gadget: Use dbg_ep0() macro instead of serial_printf() arm: omap3: Compile lowlevel_init() function only when it is used arm: omap3: Compile s_init() function only when it is used Nokia RX-51: Remove function set_muxconf_regs() Nokia RX-51: Move content of rx51.h to rx51.c Nokia RX-51: Enable usbtty serial console by default
Makefile | 1 + arch/arm/mach-omap2/omap3/board.c | 3 + arch/arm/mach-omap2/omap3/lowlevel_init.S | 6 +- board/nokia/rx51/rx51.c | 28 +- board/nokia/rx51/rx51.h | 377 ---------------------- configs/nokia_rx51_defconfig | 6 +- doc/README.nokia_rx51 | 15 +- drivers/serial/usbtty.c | 4 +- drivers/usb/gadget/core.c | 38 +-- drivers/usb/gadget/ep0.c | 47 ++- drivers/usb/musb/musb_core.c | 10 +- drivers/usb/musb/musb_udc.c | 19 +- include/configs/nokia_rx51.h | 16 +- include/usbdevice.h | 15 - 14 files changed, 92 insertions(+), 493 deletions(-) delete mode 100644 board/nokia/rx51/rx51.h
-- 2.20.1
On Sunday 29 November 2020 17:46:05 Pali Rohár wrote:
With current implementation there is an issue in musb driver that it loose receiving bytes from USB bus when too many a characters are send over USB tty from computer. Typing on keyboard to kermit terminal connected to /dev/ttyACM0 is working fine. But pasting more more bytes to terminal cause data lost on receiving side. I do not know where is the issue or how to fix it (it looks like that data are lost at low level when reading them from msub FIFO hardware) but typing on keyboard is working fine. This is rather issue for sending files via x/y/z-modem or kermit protocol. Currently U-Boot is not able to receive any file via usbtty with musb driver due to this issue.
This musb issue is fixed in second patch series "usbtty/musb: Fix file transfers"
Hi Lukasz,
On 29/11/20 10:16 pm, Pali Rohár wrote:
This patch series fix usbtty code (serial console via USB peripheral mode), fix underlying musb peripheral code, fix compilation of CONFIG_USB_DEVICE (used by usbtty), remove unused Nokia RX-51 code to decrease size of U-Boot binary and finally enable usbtty serial console for Nokia RX-51.
With this patch series debugging of Nokia RX-51 can be done also via USB serial console.
On computer this serial console is accessible via /dev/ttyACM0 device.
With current implementation there is an issue in musb driver that it loose receiving bytes from USB bus when too many a characters are send over USB tty from computer. Typing on keyboard to kermit terminal connected to /dev/ttyACM0 is working fine. But pasting more more bytes to terminal cause data lost on receiving side. I do not know where is the issue or how to fix it (it looks like that data are lost at low level when reading them from msub FIFO hardware) but typing on keyboard is working fine. This is rather issue for sending files via x/y/z-modem or kermit protocol. Currently U-Boot is not able to receive any file via usbtty with musb driver due to this issue.
Can you take a look at usb related patches and merge them if you are okay with it?
Thanks and regards, Lokesh
Pali Rohár (13): serial: usbtty: Fix puts function usb: musb: Fix compilation of gadget code usb: musb: Always clear the data toggle bit when configuring ep usb: musb: Fix configuring FIFO for endpoints usb: musb: Read value of PERI_RXCSR to 16bit variable usb: musb: Fix transmission of bigger buffers usb: gadget: Do not export usbd_device_* arrays usb: gadget: Use dbg_ep0() macro instead of serial_printf() arm: omap3: Compile lowlevel_init() function only when it is used arm: omap3: Compile s_init() function only when it is used Nokia RX-51: Remove function set_muxconf_regs() Nokia RX-51: Move content of rx51.h to rx51.c Nokia RX-51: Enable usbtty serial console by default
Makefile | 1 + arch/arm/mach-omap2/omap3/board.c | 3 + arch/arm/mach-omap2/omap3/lowlevel_init.S | 6 +- board/nokia/rx51/rx51.c | 28 +- board/nokia/rx51/rx51.h | 377 ---------------------- configs/nokia_rx51_defconfig | 6 +- doc/README.nokia_rx51 | 15 +- drivers/serial/usbtty.c | 4 +- drivers/usb/gadget/core.c | 38 +-- drivers/usb/gadget/ep0.c | 47 ++- drivers/usb/musb/musb_core.c | 10 +- drivers/usb/musb/musb_udc.c | 19 +- include/configs/nokia_rx51.h | 16 +- include/usbdevice.h | 15 - 14 files changed, 92 insertions(+), 493 deletions(-) delete mode 100644 board/nokia/rx51/rx51.h
Hello!
On Sunday 17 January 2021 16:07:30 Lokesh Vutla wrote:
Hi Lukasz,
On 29/11/20 10:16 pm, Pali Rohár wrote:
This patch series fix usbtty code (serial console via USB peripheral mode), fix underlying musb peripheral code, fix compilation of CONFIG_USB_DEVICE (used by usbtty), remove unused Nokia RX-51 code to decrease size of U-Boot binary and finally enable usbtty serial console for Nokia RX-51.
With this patch series debugging of Nokia RX-51 can be done also via USB serial console.
On computer this serial console is accessible via /dev/ttyACM0 device.
With current implementation there is an issue in musb driver that it loose receiving bytes from USB bus when too many a characters are send over USB tty from computer. Typing on keyboard to kermit terminal connected to /dev/ttyACM0 is working fine. But pasting more more bytes to terminal cause data lost on receiving side. I do not know where is the issue or how to fix it (it looks like that data are lost at low level when reading them from msub FIFO hardware) but typing on keyboard is working fine. This is rather issue for sending files via x/y/z-modem or kermit protocol. Currently U-Boot is not able to receive any file via usbtty with musb driver due to this issue.
Can you take a look at usb related patches and merge them if you are okay with it?
Thanks and regards, Lokesh
I would like to remind this patch series too!
I have not received any negative feedback on it for 2 months and patches were already reviewed by Pavel.
Could you please merge this patch series?
Pali Rohár (13): serial: usbtty: Fix puts function usb: musb: Fix compilation of gadget code usb: musb: Always clear the data toggle bit when configuring ep usb: musb: Fix configuring FIFO for endpoints usb: musb: Read value of PERI_RXCSR to 16bit variable usb: musb: Fix transmission of bigger buffers usb: gadget: Do not export usbd_device_* arrays usb: gadget: Use dbg_ep0() macro instead of serial_printf() arm: omap3: Compile lowlevel_init() function only when it is used arm: omap3: Compile s_init() function only when it is used Nokia RX-51: Remove function set_muxconf_regs() Nokia RX-51: Move content of rx51.h to rx51.c Nokia RX-51: Enable usbtty serial console by default
Makefile | 1 + arch/arm/mach-omap2/omap3/board.c | 3 + arch/arm/mach-omap2/omap3/lowlevel_init.S | 6 +- board/nokia/rx51/rx51.c | 28 +- board/nokia/rx51/rx51.h | 377 ---------------------- configs/nokia_rx51_defconfig | 6 +- doc/README.nokia_rx51 | 15 +- drivers/serial/usbtty.c | 4 +- drivers/usb/gadget/core.c | 38 +-- drivers/usb/gadget/ep0.c | 47 ++- drivers/usb/musb/musb_core.c | 10 +- drivers/usb/musb/musb_udc.c | 19 +- include/configs/nokia_rx51.h | 16 +- include/usbdevice.h | 15 - 14 files changed, 92 insertions(+), 493 deletions(-) delete mode 100644 board/nokia/rx51/rx51.h
participants (4)
-
Andy Shevchenko -
Lokesh Vutla -
Pali Rohár -
Pavel Machek