diff options
| author | Tino Reichardt <milky-lede@mcmilk.de> | 2017-05-07 19:30:36 +0200 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2017-06-03 21:35:53 +0200 |
| commit | e097eb27af4dcee394c13fbfc06e0bd51d4598ff (patch) | |
| tree | 8a14d969bd5b2aa9f2e545c008c7728b38a0904c /target/linux/lantiq/patches-4.9 | |
| parent | 5ca2033d33f0c860e6c27bad0fc3937c6fbdae40 (diff) | |
| download | upstream-e097eb27af4dcee394c13fbfc06e0bd51d4598ff.tar.gz upstream-e097eb27af4dcee394c13fbfc06e0bd51d4598ff.tar.bz2 upstream-e097eb27af4dcee394c13fbfc06e0bd51d4598ff.zip | |
lantiq: fix 0008-MIPS-lantiq-backport-old-timer-code.patch for Amazon-SE
The patch 0008 removes the vanilla kernel gptu.c of lantiq.
But the replacement file timer.c does not work Amazon-SE and
is also protected therefore with an CONFIG_SOC_AMAZON_SE :-)
This commit will re-activate the default vanilla kernel code
in gptu.c for Amazon-SE.
Signed-off-by: Tino Reichardt <milky-lede@mcmilk.de>
[refresh patches and add same change for kernel 4.9]
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'target/linux/lantiq/patches-4.9')
| -rw-r--r-- | target/linux/lantiq/patches-4.9/0008-MIPS-lantiq-backport-old-timer-code.patch | 10 | ||||
| -rw-r--r-- | target/linux/lantiq/patches-4.9/0035-owrt-lantiq-wifi-and-ethernet-eeprom-handling.patch | 2 |
2 files changed, 9 insertions, 3 deletions
diff --git a/target/linux/lantiq/patches-4.9/0008-MIPS-lantiq-backport-old-timer-code.patch b/target/linux/lantiq/patches-4.9/0008-MIPS-lantiq-backport-old-timer-code.patch index f36a79a83b..335a1e2616 100644 --- a/target/linux/lantiq/patches-4.9/0008-MIPS-lantiq-backport-old-timer-code.patch +++ b/target/linux/lantiq/patches-4.9/0008-MIPS-lantiq-backport-old-timer-code.patch @@ -172,9 +172,15 @@ Signed-off-by: John Crispin <blogic@openwrt.org> +#endif /* __DANUBE_GPTU_DEV_H__2005_07_26__10_19__ */ --- a/arch/mips/lantiq/xway/Makefile +++ b/arch/mips/lantiq/xway/Makefile -@@ -1,4 +1,4 @@ +@@ -1,4 +1,10 @@ -obj-y := prom.o sysctrl.o clk.o reset.o dma.o gptu.o dcdc.o -+obj-y := prom.o sysctrl.o clk.o reset.o dma.o timer.o dcdc.o ++obj-y := prom.o sysctrl.o clk.o reset.o dma.o dcdc.o ++ ++ifdef CONFIG_SOC_AMAZON_SE ++obj-y += gptu.o ++else ++obj-y += timer.o ++endif obj-y += vmmc.o diff --git a/target/linux/lantiq/patches-4.9/0035-owrt-lantiq-wifi-and-ethernet-eeprom-handling.patch b/target/linux/lantiq/patches-4.9/0035-owrt-lantiq-wifi-and-ethernet-eeprom-handling.patch index d875c55fb8..cef4c1e2a3 100644 --- a/target/linux/lantiq/patches-4.9/0035-owrt-lantiq-wifi-and-ethernet-eeprom-handling.patch +++ b/target/linux/lantiq/patches-4.9/0035-owrt-lantiq-wifi-and-ethernet-eeprom-handling.patch @@ -27,7 +27,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org> #endif /* _LTQ_XWAY_H__ */ --- a/arch/mips/lantiq/xway/Makefile +++ b/arch/mips/lantiq/xway/Makefile -@@ -2,4 +2,7 @@ obj-y := prom.o sysctrl.o clk.o reset.o +@@ -8,4 +8,7 @@ endif obj-y += vmmc.o |