From 98626f8441add596486b5fd176a5ea6fa16609c8 Mon Sep 17 00:00:00 2001 From: Rouven Czerwinski Date: Thu, 29 Nov 2018 11:58:34 +0100 Subject: add RPI3 Support Signed-off-by: Rouven Czerwinski --- ...001-ARM-imx-add-support-for-Udoo-Neo-full.patch | 20 +++--- .../0101-ARM-rpi-fix-typo-in-rpi-common.c.patch | 31 +++++++++ ...8.12.0-customers-pengutronix-multiv7-2018.patch | 22 ------ ...-move-clks-into-board-specific-rpi-common.patch | 77 +++++++++++++++++++++ ...rpi-retrieve-miniuart-clock-from-firmware.patch | 34 ++++++++++ ...erial_ns16550-handle-default-reg-io-width.patch | 78 ++++++++++++++++++++++ ...6550-add-raspberry-pi-compatible-and-init.patch | 62 +++++++++++++++++ .../0106-ARM-rpi-add-NS16550-support.patch | 24 +++++++ .../0107-ARM-rpi-choose-miniuart-as-stdout.patch | 34 ++++++++++ ...m283x-remove-miniuart-overlay-instruction.patch | 24 +++++++ ...8.12.0-customers-pengutronix-multiv7-2018.patch | 21 ++++++ .../platform-v7a/patches/barebox-2018.12.0/series | 21 ++++-- 12 files changed, 411 insertions(+), 37 deletions(-) create mode 100644 configs/platform-v7a/patches/barebox-2018.12.0/0101-ARM-rpi-fix-typo-in-rpi-common.c.patch delete mode 100644 configs/platform-v7a/patches/barebox-2018.12.0/0101-Release-2018.12.0-customers-pengutronix-multiv7-2018.patch create mode 100644 configs/platform-v7a/patches/barebox-2018.12.0/0102-ARM-rpi-move-clks-into-board-specific-rpi-common.patch create mode 100644 configs/platform-v7a/patches/barebox-2018.12.0/0103-ARM-rpi-retrieve-miniuart-clock-from-firmware.patch create mode 100644 configs/platform-v7a/patches/barebox-2018.12.0/0104-serial_ns16550-handle-default-reg-io-width.patch create mode 100644 configs/platform-v7a/patches/barebox-2018.12.0/0105-serial_ns16550-add-raspberry-pi-compatible-and-init.patch create mode 100644 configs/platform-v7a/patches/barebox-2018.12.0/0106-ARM-rpi-add-NS16550-support.patch create mode 100644 configs/platform-v7a/patches/barebox-2018.12.0/0107-ARM-rpi-choose-miniuart-as-stdout.patch create mode 100644 configs/platform-v7a/patches/barebox-2018.12.0/0108-doc-bcm283x-remove-miniuart-overlay-instruction.patch create mode 100644 configs/platform-v7a/patches/barebox-2018.12.0/0201-Release-2018.12.0-customers-pengutronix-multiv7-2018.patch (limited to 'configs/platform-v7a/patches') diff --git a/configs/platform-v7a/patches/barebox-2018.12.0/0001-ARM-imx-add-support-for-Udoo-Neo-full.patch b/configs/platform-v7a/patches/barebox-2018.12.0/0001-ARM-imx-add-support-for-Udoo-Neo-full.patch index 885dd61..b5b5f6f 100644 --- a/configs/platform-v7a/patches/barebox-2018.12.0/0001-ARM-imx-add-support-for-Udoo-Neo-full.patch +++ b/configs/platform-v7a/patches/barebox-2018.12.0/0001-ARM-imx-add-support-for-Udoo-Neo-full.patch @@ -8,16 +8,16 @@ Content-Transfer-Encoding: 8bit Signed-off-by: Uwe Kleine-König Forwarded: id:20170627190317.19253-1-uwe@kleine-koenig.org --- - arch/arm/boards/Makefile | 1 + - arch/arm/boards/udoo-neo/Makefile | 2 + - arch/arm/boards/udoo-neo/board.c | 27 ++++ - .../flash-header-mx6sx-udoo-neo_full.imxcfg | 124 ++++++++++++++++++ - arch/arm/boards/udoo-neo/lowlevel.c | 39 ++++++ - arch/arm/dts/Makefile | 1 + - arch/arm/dts/imx6sx-udoo-neo-full.dts | 4 + - arch/arm/mach-imx/Kconfig | 4 + - arch/arm/mach-imx/include/mach/esdctl.h | 1 + - images/Makefile.imx | 5 + + arch/arm/boards/Makefile | 1 + + arch/arm/boards/udoo-neo/Makefile | 2 + + arch/arm/boards/udoo-neo/board.c | 27 +++++ + .../flash-header-mx6sx-udoo-neo_full.imxcfg | 124 +++++++++++++++++++++ + arch/arm/boards/udoo-neo/lowlevel.c | 39 +++++++ + arch/arm/dts/Makefile | 1 + + arch/arm/dts/imx6sx-udoo-neo-full.dts | 4 + + arch/arm/mach-imx/Kconfig | 4 + + arch/arm/mach-imx/include/mach/esdctl.h | 1 + + images/Makefile.imx | 5 + 10 files changed, 208 insertions(+) create mode 100644 arch/arm/boards/udoo-neo/Makefile create mode 100644 arch/arm/boards/udoo-neo/board.c diff --git a/configs/platform-v7a/patches/barebox-2018.12.0/0101-ARM-rpi-fix-typo-in-rpi-common.c.patch b/configs/platform-v7a/patches/barebox-2018.12.0/0101-ARM-rpi-fix-typo-in-rpi-common.c.patch new file mode 100644 index 0000000..9473e9b --- /dev/null +++ b/configs/platform-v7a/patches/barebox-2018.12.0/0101-ARM-rpi-fix-typo-in-rpi-common.c.patch @@ -0,0 +1,31 @@ +From: Rouven Czerwinski +Date: Wed, 12 Dec 2018 16:43:06 +0100 +Subject: [PATCH] ARM: rpi: fix typo in rpi-common.c + +Signed-off-by: Rouven Czerwinski +--- + arch/arm/boards/raspberry-pi/rpi-common.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/arch/arm/boards/raspberry-pi/rpi-common.c b/arch/arm/boards/raspberry-pi/rpi-common.c +index b7ce0ad425e8..9f0531fd05d9 100644 +--- a/arch/arm/boards/raspberry-pi/rpi-common.c ++++ b/arch/arm/boards/raspberry-pi/rpi-common.c +@@ -73,7 +73,7 @@ static int rpi_get_arm_mem(u32 *size) + return 0; + } + +-static struct clk *rpi_register_firmare_clock(u32 clock_id, const char *name) ++static struct clk *rpi_register_firmware_clock(u32 clock_id, const char *name) + { + BCM2835_MBOX_STACK_ALIGN(struct msg_get_clock_rate, msg); + int ret; +@@ -285,7 +285,7 @@ static int rpi_clock_init(void) + { + struct clk *clk; + +- clk = rpi_register_firmare_clock(BCM2835_MBOX_CLOCK_ID_EMMC, ++ clk = rpi_register_firmware_clock(BCM2835_MBOX_CLOCK_ID_EMMC, + "bcm2835_mci0"); + if (IS_ERR(clk)) + return PTR_ERR(clk); diff --git a/configs/platform-v7a/patches/barebox-2018.12.0/0101-Release-2018.12.0-customers-pengutronix-multiv7-2018.patch b/configs/platform-v7a/patches/barebox-2018.12.0/0101-Release-2018.12.0-customers-pengutronix-multiv7-2018.patch deleted file mode 100644 index 836a7ff..0000000 --- a/configs/platform-v7a/patches/barebox-2018.12.0/0101-Release-2018.12.0-customers-pengutronix-multiv7-2018.patch +++ /dev/null @@ -1,22 +0,0 @@ -From: Rouven Czerwinski -Date: Fri, 7 Dec 2018 15:18:01 +0100 -Subject: [PATCH] Release 2018.12.0/customers/pengutronix/multiv7/20181207-1 - -Signed-off-by: Rouven Czerwinski ---- - Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Makefile b/Makefile -index 1ce50d025e47..84de26cbb028 100644 ---- a/Makefile -+++ b/Makefile -@@ -1,7 +1,7 @@ - VERSION = 2018 - PATCHLEVEL = 12 - SUBLEVEL = 0 --EXTRAVERSION = -+EXTRAVERSION =-20181207-1 - NAME = None - - # *DOCUMENTATION* diff --git a/configs/platform-v7a/patches/barebox-2018.12.0/0102-ARM-rpi-move-clks-into-board-specific-rpi-common.patch b/configs/platform-v7a/patches/barebox-2018.12.0/0102-ARM-rpi-move-clks-into-board-specific-rpi-common.patch new file mode 100644 index 0000000..38aa78e --- /dev/null +++ b/configs/platform-v7a/patches/barebox-2018.12.0/0102-ARM-rpi-move-clks-into-board-specific-rpi-common.patch @@ -0,0 +1,77 @@ +From: Rouven Czerwinski +Date: Wed, 12 Dec 2018 16:43:45 +0100 +Subject: [PATCH] ARM: rpi: move clks into board specific rpi-common + +We don't know if the firmware running on the raspberry pi is the same firmware +which is running on all bcm283x devices. +Therefore move the console clock initialization into the rpi-common.c board file. +A future commit will use this function to retrieve the miniuart clock from the +raspberry pi firmware. +No functional changes. + +Signed-off-by: Rouven Czerwinski +--- + arch/arm/boards/raspberry-pi/rpi-common.c | 19 +++++++++++++++++++ + arch/arm/mach-bcm283x/core.c | 19 ------------------- + 2 files changed, 19 insertions(+), 19 deletions(-) + +diff --git a/arch/arm/boards/raspberry-pi/rpi-common.c b/arch/arm/boards/raspberry-pi/rpi-common.c +index 9f0531fd05d9..490aeef12306 100644 +--- a/arch/arm/boards/raspberry-pi/rpi-common.c ++++ b/arch/arm/boards/raspberry-pi/rpi-common.c +@@ -297,6 +297,25 @@ static int rpi_clock_init(void) + } + postconsole_initcall(rpi_clock_init); + ++static int rpi_console_clock_init(void) ++{ ++ struct clk *clk; ++ ++ clk = clk_fixed("apb_pclk", 0); ++ clk_register_clkdev(clk, "apb_pclk", NULL); ++ ++ clk = clk_fixed("uart0-pl0110", 3 * 1000 * 1000); ++ clk_register_clkdev(clk, NULL, "uart0-pl0110"); ++ clkdev_add_physbase(clk, 0x20201000, NULL); ++ clkdev_add_physbase(clk, 0x3f201000, NULL); ++ ++ clk = clk_fixed("bcm2835-cs", 1 * 1000 * 1000); ++ clk_register_clkdev(clk, NULL, "bcm2835-cs"); ++ ++ return 0; ++} ++postcore_initcall(rpi_console_clock_init); ++ + static int rpi_env_init(void) + { + struct stat s; +diff --git a/arch/arm/mach-bcm283x/core.c b/arch/arm/mach-bcm283x/core.c +index f1dcda86f7f0..f2528cf1f150 100644 +--- a/arch/arm/mach-bcm283x/core.c ++++ b/arch/arm/mach-bcm283x/core.c +@@ -31,25 +31,6 @@ + #include + #include + +-static int bcm2835_clk_init(void) +-{ +- struct clk *clk; +- +- clk = clk_fixed("apb_pclk", 0); +- clk_register_clkdev(clk, "apb_pclk", NULL); +- +- clk = clk_fixed("uart0-pl0110", 3 * 1000 * 1000); +- clk_register_clkdev(clk, NULL, "uart0-pl0110"); +- clkdev_add_physbase(clk, 0x20201000, NULL); +- clkdev_add_physbase(clk, 0x3f201000, NULL); +- +- clk = clk_fixed("bcm2835-cs", 1 * 1000 * 1000); +- clk_register_clkdev(clk, NULL, "bcm2835-cs"); +- +- return 0; +-} +-postcore_initcall(bcm2835_clk_init); +- + void bcm2835_add_device_sdram(u32 size) + { + if (!size) diff --git a/configs/platform-v7a/patches/barebox-2018.12.0/0103-ARM-rpi-retrieve-miniuart-clock-from-firmware.patch b/configs/platform-v7a/patches/barebox-2018.12.0/0103-ARM-rpi-retrieve-miniuart-clock-from-firmware.patch new file mode 100644 index 0000000..95daa60 --- /dev/null +++ b/configs/platform-v7a/patches/barebox-2018.12.0/0103-ARM-rpi-retrieve-miniuart-clock-from-firmware.patch @@ -0,0 +1,34 @@ +From: Rouven Czerwinski +Date: Thu, 13 Dec 2018 07:23:37 +0100 +Subject: [PATCH] ARM: rpi: retrieve miniuart clock from firmware + +The miniuart uses the core clock as the clock source. This clock is fixed by the +firmware to 250Mhz if enable_uart=1 is set in the config.txt file. +However a user could still choose to overclock the core frequency, +which would result in wrong baudrates computed by barebox. +Retrieve the core clock frequency from the firmware to allow all potential +firmware configurations to work with barebox. + +Signed-off-by: Rouven Czerwinski +--- + arch/arm/boards/raspberry-pi/rpi-common.c | 7 +++++++ + 1 file changed, 7 insertions(+) + +diff --git a/arch/arm/boards/raspberry-pi/rpi-common.c b/arch/arm/boards/raspberry-pi/rpi-common.c +index 490aeef12306..e29177d08e20 100644 +--- a/arch/arm/boards/raspberry-pi/rpi-common.c ++++ b/arch/arm/boards/raspberry-pi/rpi-common.c +@@ -309,6 +309,13 @@ static int rpi_console_clock_init(void) + clkdev_add_physbase(clk, 0x20201000, NULL); + clkdev_add_physbase(clk, 0x3f201000, NULL); + ++ clk = rpi_register_firmware_clock(BCM2835_MBOX_CLOCK_ID_CORE, ++ "uart1-8250"); ++ if (IS_ERR(clk)) ++ return PTR_ERR(clk); ++ ++ clkdev_add_physbase(clk, 0x3f215040, NULL); ++ + clk = clk_fixed("bcm2835-cs", 1 * 1000 * 1000); + clk_register_clkdev(clk, NULL, "bcm2835-cs"); + diff --git a/configs/platform-v7a/patches/barebox-2018.12.0/0104-serial_ns16550-handle-default-reg-io-width.patch b/configs/platform-v7a/patches/barebox-2018.12.0/0104-serial_ns16550-handle-default-reg-io-width.patch new file mode 100644 index 0000000..568d74d --- /dev/null +++ b/configs/platform-v7a/patches/barebox-2018.12.0/0104-serial_ns16550-handle-default-reg-io-width.patch @@ -0,0 +1,78 @@ +From: Rouven Czerwinski +Date: Tue, 11 Dec 2018 11:28:33 +0100 +Subject: [PATCH] serial_ns16550: handle default reg-io-width + +According to the device tree bindings for 8250, width is an optional property. +Default to 1 which is the same default value as used by the kernel. +Before this change the driver would not work for device trees which do not +include the optional binding. + +Signed-off-by: Rouven Czerwinski +--- + drivers/serial/serial_ns16550.c | 46 ++++++++++++++++++++--------------------- + 1 file changed, 23 insertions(+), 23 deletions(-) + +diff --git a/drivers/serial/serial_ns16550.c b/drivers/serial/serial_ns16550.c +index 4d73ea8b8740..8ddcfdbefc1d 100644 +--- a/drivers/serial/serial_ns16550.c ++++ b/drivers/serial/serial_ns16550.c +@@ -297,36 +297,36 @@ static int ns16550_tstc(struct console_device *cdev) + static void ns16550_probe_dt(struct device_d *dev, struct ns16550_priv *priv) + { + struct device_node *np = dev->device_node; +- u32 width; ++ u32 width = 1; + + if (!IS_ENABLED(CONFIG_OFDEVICE)) + return; + + of_property_read_u32(np, "clock-frequency", &priv->plat.clock); + of_property_read_u32(np, "reg-shift", &priv->plat.shift); +- if (!of_property_read_u32(np, "reg-io-width", &width)) +- switch (width) { +- case 1: +- priv->read_reg = ns16550_read_reg_mmio_8; +- priv->write_reg = ns16550_write_reg_mmio_8; +- break; +- case 2: +- priv->read_reg = ns16550_read_reg_mmio_16; +- priv->write_reg = ns16550_write_reg_mmio_16; +- break; +- case 4: +- if (of_device_is_big_endian(np)) { +- priv->read_reg = ns16550_read_reg_mmio_32be; +- priv->write_reg = ns16550_write_reg_mmio_32be; +- } else { +- priv->read_reg = ns16550_read_reg_mmio_32; +- priv->write_reg = ns16550_write_reg_mmio_32; +- } +- break; +- default: +- dev_err(dev, "unsupported reg-io-width (%d)\n", +- width); ++ of_property_read_u32(np, "reg-io-width", &width); ++ switch (width) { ++ case 1: ++ priv->read_reg = ns16550_read_reg_mmio_8; ++ priv->write_reg = ns16550_write_reg_mmio_8; ++ break; ++ case 2: ++ priv->read_reg = ns16550_read_reg_mmio_16; ++ priv->write_reg = ns16550_write_reg_mmio_16; ++ break; ++ case 4: ++ if (of_device_is_big_endian(np)) { ++ priv->read_reg = ns16550_read_reg_mmio_32be; ++ priv->write_reg = ns16550_write_reg_mmio_32be; ++ } else { ++ priv->read_reg = ns16550_read_reg_mmio_32; ++ priv->write_reg = ns16550_write_reg_mmio_32; + } ++ break; ++ default: ++ dev_err(dev, "unsupported reg-io-width (%d)\n", ++ width); ++ } + } + + static struct ns16550_drvdata ns16450_drvdata = { diff --git a/configs/platform-v7a/patches/barebox-2018.12.0/0105-serial_ns16550-add-raspberry-pi-compatible-and-init.patch b/configs/platform-v7a/patches/barebox-2018.12.0/0105-serial_ns16550-add-raspberry-pi-compatible-and-init.patch new file mode 100644 index 0000000..911a0e2 --- /dev/null +++ b/configs/platform-v7a/patches/barebox-2018.12.0/0105-serial_ns16550-add-raspberry-pi-compatible-and-init.patch @@ -0,0 +1,62 @@ +From: Rouven Czerwinski +Date: Tue, 11 Dec 2018 10:50:44 +0100 +Subject: [PATCH] serial_ns16550: add raspberry pi compatible and init + +Add the compatible for the Raspberry Pi AUX UART and an init function which +enables it via the aux register and configures the correct shift value. + +Signed-off-by: Rouven Czerwinski +--- + drivers/serial/serial_ns16550.c | 25 +++++++++++++++++++++++++ + 1 file changed, 25 insertions(+) + +diff --git a/drivers/serial/serial_ns16550.c b/drivers/serial/serial_ns16550.c +index 8ddcfdbefc1d..7a4054a67e41 100644 +--- a/drivers/serial/serial_ns16550.c ++++ b/drivers/serial/serial_ns16550.c +@@ -253,6 +253,20 @@ static void ns16550_jz_init_port(struct console_device *cdev) + ns16550_serial_init_port(cdev); + } + ++static void rpi_init_port(struct console_device *cdev) ++{ ++ struct ns16550_priv *priv = to_ns16550_priv(cdev); ++ ++ writeb(0x01, 0x3f215004); ++ priv->plat.shift = 2; ++ /* ++ * We double the clock rate since the 16550 will divide by 16 ++ * (instead of 8 required by the BCM2835 peripheral manual) ++ */ ++ priv->plat.clock = priv->plat.clock*2; ++ ns16550_serial_init_port(cdev); ++} ++ + /*********** Exposed Functions **********************************/ + + /** +@@ -353,6 +367,11 @@ static __maybe_unused struct ns16550_drvdata tegra_drvdata = { + .linux_console_name = "ttyS", + }; + ++static struct ns16550_drvdata rpi_drvdata = { ++ .init_port = rpi_init_port, ++ .linux_console_name = "ttyS", ++}; ++ + static int ns16550_init_iomem(struct device_d *dev, struct ns16550_priv *priv) + { + struct resource *iores; +@@ -527,6 +546,12 @@ static struct of_device_id ns16550_serial_dt_ids[] = { + .compatible = "ingenic,jz4740-uart", + .data = &jz_drvdata, + }, ++#endif ++#if IS_ENABLED(CONFIG_MACH_RPI_COMMON) ++ { ++ .compatible = "brcm,bcm2835-aux-uart", ++ .data = &rpi_drvdata, ++ }, + #endif + { + /* sentinel */ diff --git a/configs/platform-v7a/patches/barebox-2018.12.0/0106-ARM-rpi-add-NS16550-support.patch b/configs/platform-v7a/patches/barebox-2018.12.0/0106-ARM-rpi-add-NS16550-support.patch new file mode 100644 index 0000000..2e368cf --- /dev/null +++ b/configs/platform-v7a/patches/barebox-2018.12.0/0106-ARM-rpi-add-NS16550-support.patch @@ -0,0 +1,24 @@ +From: Rouven Czerwinski +Date: Wed, 12 Dec 2018 14:33:43 +0100 +Subject: [PATCH] ARM: rpi: add NS16550 support + +Since the 16550 driver now supports the RPI3 miniuart, enable it in the default +config. + +Signed-off-by: Rouven Czerwinski +--- + arch/arm/configs/rpi_defconfig | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/arch/arm/configs/rpi_defconfig b/arch/arm/configs/rpi_defconfig +index 2bb615849324..dc5ab1fe17f6 100644 +--- a/arch/arm/configs/rpi_defconfig ++++ b/arch/arm/configs/rpi_defconfig +@@ -63,6 +63,7 @@ CONFIG_CMD_OF_PROPERTY=y + CONFIG_CMD_OFTREE=y + CONFIG_CMD_TIME=y + CONFIG_SERIAL_AMBA_PL011=y ++CONFIG_DRIVER_SERIAL_NS16550=y + CONFIG_MCI=y + CONFIG_MCI_BCM283X=y + CONFIG_LED=y diff --git a/configs/platform-v7a/patches/barebox-2018.12.0/0107-ARM-rpi-choose-miniuart-as-stdout.patch b/configs/platform-v7a/patches/barebox-2018.12.0/0107-ARM-rpi-choose-miniuart-as-stdout.patch new file mode 100644 index 0000000..126fe01 --- /dev/null +++ b/configs/platform-v7a/patches/barebox-2018.12.0/0107-ARM-rpi-choose-miniuart-as-stdout.patch @@ -0,0 +1,34 @@ +From: Rouven Czerwinski +Date: Tue, 11 Dec 2018 10:48:02 +0100 +Subject: [PATCH] ARM: rpi: choose miniuart as stdout + +Since we now support the miniuart, enable it as the default stdout port. +With this change the device tree overlay to switch the miniuart to bluetooth is +no longer necessary. + +Signed-off-by: Rouven Czerwinski +--- + arch/arm/dts/bcm2837-rpi-3.dts | 7 +------ + 1 file changed, 1 insertion(+), 6 deletions(-) + +diff --git a/arch/arm/dts/bcm2837-rpi-3.dts b/arch/arm/dts/bcm2837-rpi-3.dts +index d6ffc369122c..194b41c23b77 100644 +--- a/arch/arm/dts/bcm2837-rpi-3.dts ++++ b/arch/arm/dts/bcm2837-rpi-3.dts +@@ -2,15 +2,10 @@ + + / { + chosen { +- stdout-path = &uart0; ++ stdout-path = &uart1; + }; + + memory { + reg = <0x0 0x0>; + }; + }; +- +-&uart0 { +- status = "okay"; +- /delete-node/ bluetooth; +-}; diff --git a/configs/platform-v7a/patches/barebox-2018.12.0/0108-doc-bcm283x-remove-miniuart-overlay-instruction.patch b/configs/platform-v7a/patches/barebox-2018.12.0/0108-doc-bcm283x-remove-miniuart-overlay-instruction.patch new file mode 100644 index 0000000..9d43761 --- /dev/null +++ b/configs/platform-v7a/patches/barebox-2018.12.0/0108-doc-bcm283x-remove-miniuart-overlay-instruction.patch @@ -0,0 +1,24 @@ +From: Rouven Czerwinski +Date: Wed, 12 Dec 2018 15:06:49 +0100 +Subject: [PATCH] doc: bcm283x: remove miniuart overlay instruction + +Since we now use the miniuart on the raspberry pi 3, the miniuart overlay is no +longer needed. + +Signed-off-by: Rouven Czerwinski +--- + Documentation/boards/bcm2835.rst | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/Documentation/boards/bcm2835.rst b/Documentation/boards/bcm2835.rst +index 79ea0ff7a78b..ea80d5834861 100644 +--- a/Documentation/boards/bcm2835.rst ++++ b/Documentation/boards/bcm2835.rst +@@ -22,7 +22,6 @@ Raspberry Pi + + kernel=barebox.img + enable_uart=1 +- dtoverlay=pi3-miniuart-bt + + (For more information, refer to the `documentation for config.txt`_.) + diff --git a/configs/platform-v7a/patches/barebox-2018.12.0/0201-Release-2018.12.0-customers-pengutronix-multiv7-2018.patch b/configs/platform-v7a/patches/barebox-2018.12.0/0201-Release-2018.12.0-customers-pengutronix-multiv7-2018.patch new file mode 100644 index 0000000..38f2a36 --- /dev/null +++ b/configs/platform-v7a/patches/barebox-2018.12.0/0201-Release-2018.12.0-customers-pengutronix-multiv7-2018.patch @@ -0,0 +1,21 @@ +From: Rouven Czerwinski +Date: Thu, 13 Dec 2018 11:14:57 +0100 +Subject: [PATCH] Release 2018.12.0/customers/pengutronix/multiv7/20181213-1 + +--- + Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile b/Makefile +index 1ce50d025e47..f378f3dc7adf 100644 +--- a/Makefile ++++ b/Makefile +@@ -1,7 +1,7 @@ + VERSION = 2018 + PATCHLEVEL = 12 + SUBLEVEL = 0 +-EXTRAVERSION = ++EXTRAVERSION =-20181213-1 + NAME = None + + # *DOCUMENTATION* diff --git a/configs/platform-v7a/patches/barebox-2018.12.0/series b/configs/platform-v7a/patches/barebox-2018.12.0/series index 776d279..64d799d 100644 --- a/configs/platform-v7a/patches/barebox-2018.12.0/series +++ b/configs/platform-v7a/patches/barebox-2018.12.0/series @@ -1,11 +1,22 @@ # umpf-base: v2018.12.0 # umpf-name: 2018.12.0/customers/pengutronix/multiv7 -# umpf-version: 2018.12.0/customers/pengutronix/multiv7/20181207-1 +# umpf-version: 2018.12.0/customers/pengutronix/multiv7/20181213-1 # umpf-topic: v2018.11.0/customers/pengutronix/udoo-neo # umpf-hashinfo: c5f2e150d7e8d5439458df1a2cab71b25fc36e19 -# umpf-topic-range: 0b5361a328632e64c14a54306119093a0c7fecdf..91bbdb966ae2431a0fa298d5976e9435312f555a +# umpf-topic-range: 0b5361a328632e64c14a54306119093a0c7fecdf..6f54f9c6a2100a4c0fb8e9dff5250571de0c10b2 0001-ARM-imx-add-support-for-Udoo-Neo-full.patch -# umpf-release: 2018.12.0/customers/pengutronix/multiv7/20181207-1 -# umpf-topic-range: 91bbdb966ae2431a0fa298d5976e9435312f555a..aaff0754c24c6911d3ba72f96d37fedf8007d3e6 -0101-Release-2018.12.0-customers-pengutronix-multiv7-2018.patch +# umpf-topic: v2018.12.0/topic/rpi3_miniuart +# umpf-hashinfo: 53f22789068554eaf5f42f32a662c4acd98d4b38 +# umpf-topic-range: 6f54f9c6a2100a4c0fb8e9dff5250571de0c10b2..883529b323acca020c42e7de342d00ff2d222fd8 +0101-ARM-rpi-fix-typo-in-rpi-common.c.patch +0102-ARM-rpi-move-clks-into-board-specific-rpi-common.patch +0103-ARM-rpi-retrieve-miniuart-clock-from-firmware.patch +0104-serial_ns16550-handle-default-reg-io-width.patch +0105-serial_ns16550-add-raspberry-pi-compatible-and-init.patch +0106-ARM-rpi-add-NS16550-support.patch +0107-ARM-rpi-choose-miniuart-as-stdout.patch +0108-doc-bcm283x-remove-miniuart-overlay-instruction.patch +# umpf-release: 2018.12.0/customers/pengutronix/multiv7/20181213-1 +# umpf-topic-range: 883529b323acca020c42e7de342d00ff2d222fd8..806fa2b1b5f2491cefb2a76e6dc4c775874ad866 +0201-Release-2018.12.0-customers-pengutronix-multiv7-2018.patch # umpf-end -- cgit v1.2.3