[poky] [PATCH 09/25] u-boot-xilinx: ml405 uartlite support
Adrian Alonso
aalonso at secretlab.ca
Mon Jan 17 12:29:22 PST 2011
* Add ML405 Uartlite support, find out which uart module is
used based on xparameters header file
* Fix hardcodded macros for uartns550 setting uart and
PLB bus frequency
* Fix inline qualifier from
* Bump PR
Signed-off-by: Adrian Alonso <aalonso at secretlab.ca>
---
.../files/ml405-add-uartlite-config-options.patch | 63 ++++++++++++++++++++
...405-replace-hardcode-macros-for-uartns550.patch | 36 +++++++++++
...e-inline-qualifier-from-show_boot_progres.patch | 31 ++++++++++
recipes-bsp/uboot/u-boot-xilinx_git.bb | 5 +-
4 files changed, 134 insertions(+), 1 deletions(-)
create mode 100644 recipes-bsp/uboot/files/ml405-add-uartlite-config-options.patch
create mode 100644 recipes-bsp/uboot/files/ml405-replace-hardcode-macros-for-uartns550.patch
create mode 100644 recipes-bsp/uboot/files/uboot-remove-inline-qualifier-from-show_boot_progres.patch
diff --git a/recipes-bsp/uboot/files/ml405-add-uartlite-config-options.patch b/recipes-bsp/uboot/files/ml405-add-uartlite-config-options.patch
new file mode 100644
index 0000000..8edd12a
--- /dev/null
+++ b/recipes-bsp/uboot/files/ml405-add-uartlite-config-options.patch
@@ -0,0 +1,63 @@
+From f2e7ecde205d88d28536e8454f58ba2b1ef4cc81 Mon Sep 17 00:00:00 2001
+From: Adrian Alonso <aalonso at secretlab.ca>
+Date: Thu, 16 Dec 2010 17:34:13 -0600
+Subject: [PATCH 1/2] ml405: add uartlite config options
+
+* Add CONFIG_XILINX_UARTLITE options
+* From xparameters find out which serial module
+ is included in the hardware project and configure
+ accord the available device
+
+Signed-off-by: Adrian Alonso <aalonso at secretlab.ca>
+---
+ include/configs/ml405.h | 19 +++++++++++++++++--
+ 1 files changed, 17 insertions(+), 2 deletions(-)
+
+diff --git a/include/configs/ml405.h b/include/configs/ml405.h
+index d6f4832..86f093e 100644
+--- a/include/configs/ml405.h
++++ b/include/configs/ml405.h
+@@ -115,7 +115,6 @@
+ //#define CFG_MONITOR_BASE 0xFFFC0000
+ #endif
+
+-#define CONFIG_BAUDRATE 9600
+ #define CONFIG_BOOTDELAY 5 /* autoboot after 5 seconds */
+
+ #define CONFIG_BOOTCOMMAND "" /* autoboot command */
+@@ -181,6 +180,18 @@
+ #define CFG_MEMTEST_END 0x0C00000 /* 4 ... 12 MB in DRAM */
+
+ /*
++ * Serial port
++ * uartLite
++ */
++#ifdef XPAR_UARTLITE_0_BASEADDR
++#define CONFIG_XILINX_UARTLITE
++#define CONFIG_SERIAL_BASE XPAR_UARTLITE_0_BASEADDR
++#define CONFIG_BAUDRATE XPAR_UARTLITE_0_BAUDRATE
++#define CONFIG_SYS_BAUDRATE_TABLE { CONFIG_BAUDRATE }
++#define XPAR_UART_0_CLOCK_FREQ_HZ XPAR_PLB_CLOCK_FREQ_HZ
++#else
++#ifdef XPAR_UARTNS550_0_BASEADDR
++/*
+ * 16550 UART and console
+ */
+ #define CONFIG_CONS_INDEX 1
+@@ -188,8 +199,12 @@
+ #define CFG_NS16550
+ #define CFG_NS16550_SERIAL
+ #define CFG_NS16550_REG_SIZE -4
+-#define CFG_NS16550_CLK XPAR_XUARTNS550_CLOCK_HZ
++#define CFG_NS16550_CLK XPAR_XUARTNS550_CLOCK_HZ
++#define XPAR_UART_0_CLOCK_FREQ_HZ XPAR_XUARTNS550_CLOCK_HZ
+ #define CFG_NS16550_COM1 (XPAR_UARTNS550_0_BASEADDR + 0x1003)
++#define CONFIG_BAUDRATE 9600
++#endif
++#endif
+
+ #define CFG_BAUDRATE_TABLE \
+ {300, 600, 1200, 2400, 4800, 9600, 19200, 38400,115200}
+--
+1.7.2.3
+
diff --git a/recipes-bsp/uboot/files/ml405-replace-hardcode-macros-for-uartns550.patch b/recipes-bsp/uboot/files/ml405-replace-hardcode-macros-for-uartns550.patch
new file mode 100644
index 0000000..3e8ce92
--- /dev/null
+++ b/recipes-bsp/uboot/files/ml405-replace-hardcode-macros-for-uartns550.patch
@@ -0,0 +1,36 @@
+From 111cbbadbf09b6570567b22962de4a80180aabe1 Mon Sep 17 00:00:00 2001
+From: Adrian Alonso <aalonso at secretlab.ca>
+Date: Thu, 16 Dec 2010 17:39:35 -0600
+Subject: [PATCH 2/2] ml405: replace hardcode macros for uartns550
+
+* Replace hardcoded macros for setting PLB and uart
+ frecuency
+
+Signed-off-by: Adrian Alonso <aalonso at secretlab.ca>
+---
+ board/xilinx/ml405/ml405.c | 4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/board/xilinx/ml405/ml405.c b/board/xilinx/ml405/ml405.c
+index 76dd5e5..0800b10 100755
+--- a/board/xilinx/ml405/ml405.c
++++ b/board/xilinx/ml405/ml405.c
+@@ -138,13 +138,13 @@ get_sys_info(sys_info_t * sysInfo)
+ sysInfo->freqProcessor = XPAR_CORE_CLOCK_FREQ_HZ;
+
+ /* only correct if the PLB and OPB run at the same frequency */
+- sysInfo->freqPLB = XPAR_UARTNS550_0_CLOCK_FREQ_HZ;
++ sysInfo->freqPLB = XPAR_UART_0_CLOCK_FREQ_HZ;
+ sysInfo->freqPCI = 0;
+
+ /* setup the uart clock frequency in the global data otherwise the
+ * fdt fixups on the device tree hoses it up
+ */
+- gd->uart_clk = XPAR_UARTNS550_0_CLOCK_FREQ_HZ;
++ gd->uart_clk = XPAR_UART_0_CLOCK_FREQ_HZ;
+ }
+
+ /*-----------------------------------------------------------------------------
+--
+1.7.2.3
+
diff --git a/recipes-bsp/uboot/files/uboot-remove-inline-qualifier-from-show_boot_progres.patch b/recipes-bsp/uboot/files/uboot-remove-inline-qualifier-from-show_boot_progres.patch
new file mode 100644
index 0000000..56d26ea
--- /dev/null
+++ b/recipes-bsp/uboot/files/uboot-remove-inline-qualifier-from-show_boot_progres.patch
@@ -0,0 +1,31 @@
+From 4537cc92b5c149fbcb204d8e904a7ee20b8f4b1c Mon Sep 17 00:00:00 2001
+From: Adrian Alonso <aalonso at secretlab.ca>
+Date: Mon, 6 Dec 2010 23:01:03 -0600
+Subject: [PATCH 2/2] uboot: remove inline qualifier from show_boot_progress
+
+* Remove inline qualifier from show_boot_progress
+* Gcc 4.5.1 complains about
+ main.c:51:13: error: inline function 'show_boot_progress'
+ cannot be declared weak
+
+Signed-off-by: Adrian Alonso <aalonso at secretlab.ca>
+---
+ common/main.c | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/common/main.c b/common/main.c
+index 187ef8a..e2f8bb2 100644
+--- a/common/main.c
++++ b/common/main.c
+@@ -48,7 +48,7 @@ DECLARE_GLOBAL_DATA_PTR;
+ * Board-specific Platform code can reimplement show_boot_progress () if needed
+ */
+ void inline __show_boot_progress (int val) {}
+-void inline show_boot_progress (int val) __attribute__((weak, alias("__show_boot_progress")));
++void show_boot_progress (int val) __attribute__((weak, alias("__show_boot_progress")));
+
+ #if defined(CONFIG_BOOT_RETRY_TIME) && defined(CONFIG_RESET_TO_RETRY)
+ extern int do_reset (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]); /* for do_reset() prototype */
+--
+1.7.2.3
+
diff --git a/recipes-bsp/uboot/u-boot-xilinx_git.bb b/recipes-bsp/uboot/u-boot-xilinx_git.bb
index 3b35ae5..0a30602 100644
--- a/recipes-bsp/uboot/u-boot-xilinx_git.bb
+++ b/recipes-bsp/uboot/u-boot-xilinx_git.bb
@@ -1,5 +1,5 @@
require ../meta/recipes-bsp/uboot/u-boot.inc
-PR = "r3"
+PR = "r4"
THISDIR := "${@os.path.dirname(bb.data.getVar('FILE', d, True))}"
FILESPATH =. "${@base_set_filespath(["${THISDIR}/files"], d)}:"
@@ -7,6 +7,9 @@ BRANCH="master"
TAG="e094f2479ea339d7f48b6826f06f0be4984d9a98"
SRC_URI = "git://git.xilinx.com/u-boot-xlnx.git;branch=${BRANCH};protocol=git \
file://uboot-do-not-use-Os-option.patch \
+ file://uboot-remove-inline-qualifier-from-show_boot_progres.patch \
+ file://ml405-add-uartlite-config-options.patch \
+ file://ml405-replace-hardcode-macros-for-uartns550.patch \
"
SRCREV = "${TAG}"
--
1.7.3.4
More information about the poky
mailing list