diff options
Diffstat (limited to 'target/linux/mpc85xx')
4 files changed, 29 insertions, 29 deletions
diff --git a/target/linux/mpc85xx/patches-4.14/001-powerpc-85xx-add-gpio-keys-to-of-match-table.patch b/target/linux/mpc85xx/patches-4.14/001-powerpc-85xx-add-gpio-keys-to-of-match-table.patch index ee0c4d784d..58c4be6007 100644 --- a/target/linux/mpc85xx/patches-4.14/001-powerpc-85xx-add-gpio-keys-to-of-match-table.patch +++ b/target/linux/mpc85xx/patches-4.14/001-powerpc-85xx-add-gpio-keys-to-of-match-table.patch @@ -1,10 +1,10 @@ --- a/arch/powerpc/platforms/85xx/common.c +++ b/arch/powerpc/platforms/85xx/common.c @@ -33,6 +33,7 @@ static const struct of_device_id mpc85xx - { .compatible = "fsl,mpc8548-guts", }, - /* Probably unnecessary? */ - { .compatible = "gpio-leds", }, + { .compatible = "fsl,mpc8548-guts", }, + /* Probably unnecessary? */ + { .compatible = "gpio-leds", }, + { .compatible = "gpio-keys", }, - /* For all PCI controllers */ - { .compatible = "fsl,mpc8540-pci", }, - { .compatible = "fsl,mpc8548-pcie", }, + /* For all PCI controllers */ + { .compatible = "fsl,mpc8540-pci", }, + { .compatible = "fsl,mpc8548-pcie", }, diff --git a/target/linux/mpc85xx/patches-4.14/100-powerpc-85xx-tl-wdr4900-v1-support.patch b/target/linux/mpc85xx/patches-4.14/100-powerpc-85xx-tl-wdr4900-v1-support.patch index b99d0da863..8b627fb729 100644 --- a/target/linux/mpc85xx/patches-4.14/100-powerpc-85xx-tl-wdr4900-v1-support.patch +++ b/target/linux/mpc85xx/patches-4.14/100-powerpc-85xx-tl-wdr4900-v1-support.patch @@ -22,7 +22,7 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org> src-plat-$(CONFIG_PPC_IBM_CELL_BLADE) += pseries-head.S src-plat-$(CONFIG_MVME7100) += motload-head.S mvme7100.c +src-plat-$(CONFIG_TL_WDR4900_V1) += cuboot-tl-wdr4900-v1.c - + src-wlib := $(sort $(src-wlib-y)) src-plat := $(sort $(src-plat-y)) @@ -330,7 +331,7 @@ image-$(CONFIG_TQM8555) += cuImage.tqm @@ -33,7 +33,7 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org> +image-$(CONFIG_TL_WDR4900_V1) += cuImage.tl-wdr4900-v1 # Board ports in arch/powerpc/platform/86xx/Kconfig image-$(CONFIG_MVME7100) += dtbImage.mvme7100 - + --- a/arch/powerpc/boot/wrapper +++ b/arch/powerpc/boot/wrapper @@ -277,6 +277,10 @@ cuboot*) @@ -50,9 +50,9 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org> --- a/arch/powerpc/platforms/85xx/Kconfig +++ b/arch/powerpc/platforms/85xx/Kconfig @@ -170,6 +170,17 @@ config STX_GP3 - select CPM2 - select DEFAULT_UIMAGE - + select CPM2 + select DEFAULT_UIMAGE + +config TL_WDR4900_V1 + bool "TP-Link TL-WDR4900 v1" + select DEFAULT_UIMAGE @@ -65,8 +65,8 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org> + Freescale P1014 SoC. + config TQM8540 - bool "TQ Components TQM8540" - help + bool "TQ Components TQM8540" + help --- a/arch/powerpc/platforms/85xx/Makefile +++ b/arch/powerpc/platforms/85xx/Makefile @@ -26,6 +26,7 @@ obj-$(CONFIG_CORENET_GENERIC) += coren diff --git a/target/linux/mpc85xx/patches-4.14/101-powerpc-85xx-hiveap-330-support.patch b/target/linux/mpc85xx/patches-4.14/101-powerpc-85xx-hiveap-330-support.patch index 519566bc15..34568398c2 100644 --- a/target/linux/mpc85xx/patches-4.14/101-powerpc-85xx-hiveap-330-support.patch +++ b/target/linux/mpc85xx/patches-4.14/101-powerpc-85xx-hiveap-330-support.patch @@ -1,9 +1,9 @@ --- a/arch/powerpc/platforms/85xx/Kconfig +++ b/arch/powerpc/platforms/85xx/Kconfig @@ -49,6 +49,17 @@ config BSC9132_QDS - and dual StarCore SC3850 DSP cores. - Manufacturer : Freescale Semiconductor, Inc - + and dual StarCore SC3850 DSP cores. + Manufacturer : Freescale Semiconductor, Inc + +config HIVEAP_330 + bool "Aerohive HiveAP-330" + select DEFAULT_UIMAGE @@ -16,8 +16,8 @@ + Freescale P1020 SoC. + config MPC8540_ADS - bool "Freescale MPC8540 ADS" - select DEFAULT_UIMAGE + bool "Freescale MPC8540 ADS" + select DEFAULT_UIMAGE --- a/arch/powerpc/platforms/85xx/Makefile +++ b/arch/powerpc/platforms/85xx/Makefile @@ -10,6 +10,7 @@ obj-y += common.o diff --git a/target/linux/mpc85xx/patches-4.14/102-powerpc-add-cmdline-override.patch b/target/linux/mpc85xx/patches-4.14/102-powerpc-add-cmdline-override.patch index 7f4fa249d0..a3b69bbbb3 100644 --- a/target/linux/mpc85xx/patches-4.14/102-powerpc-add-cmdline-override.patch +++ b/target/linux/mpc85xx/patches-4.14/102-powerpc-add-cmdline-override.patch @@ -1,9 +1,9 @@ --- a/arch/powerpc/Kconfig +++ b/arch/powerpc/Kconfig @@ -830,6 +830,14 @@ config CMDLINE_FORCE - This is useful if you cannot or don't want to change the - command-line options your boot loader passes to the kernel. - + This is useful if you cannot or don't want to change the + command-line options your boot loader passes to the kernel. + +config CMDLINE_OVERRIDE + bool "Use alternative cmdline from device tree" + help @@ -13,14 +13,14 @@ + cmdline if it exists in the device tree. + config EXTRA_TARGETS - string "Additional default image types" - help + string "Additional default image types" + help --- a/drivers/of/fdt.c +++ b/drivers/of/fdt.c @@ -1131,6 +1131,17 @@ int __init early_init_dt_scan_chosen(uns - if (p != NULL && l > 0) - strlcpy(data, p, min((int)l, COMMAND_LINE_SIZE)); - + if (p != NULL && l > 0) + strlcpy(data, p, min((int)l, COMMAND_LINE_SIZE)); + + /* CONFIG_CMDLINE_OVERRIDE is used to fallback to a different + * device tree option of chosen/bootargs-override. This is + * helpful on boards where u-boot sets bootargs, and is unable @@ -32,6 +32,6 @@ + strlcpy(data, p, min((int)l, COMMAND_LINE_SIZE)); +#endif + - /* - * CONFIG_CMDLINE is meant to be a default in case nothing else - * managed to set the command line, unless CONFIG_CMDLINE_FORCE + /* + * CONFIG_CMDLINE is meant to be a default in case nothing else + * managed to set the command line, unless CONFIG_CMDLINE_FORCE |