Commit graph

70 commits

Author SHA1 Message Date
John Crispin
61f27ca3e4 oxnas: clean-up NAND driver to fix probing issue
A re-write of the driver based on xway_nand.c and constants as
well as the cmd_ctrl() function from the original oxnas_nand.c
resulted in a extremely similar looking file (see diffsize),
and fixes the issue of NAND not being detected on newer kernels.

Signed-off-by: Daniel Golle <daniel@makrotopia.org>

SVN-Revision: 48986
2016-03-10 19:11:28 +00:00
Hauke Mehrtens
cb04b8d582 kernel: update kernel 4.4 to version 4.4.3
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>

SVN-Revision: 48783
2016-02-25 21:54:39 +00:00
Felix Fietkau
57776e68ce base-files: remove default /etc/config/network, generate it via board.d instead
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

SVN-Revision: 48493
2016-01-25 16:30:41 +00:00
Felix Fietkau
35a17334eb oxnas: finally make board names consistent
r48337 unfortunately incorrectly changed the boardname of the stg212
into stg-212 which is not the name of the image of DTS file or
boardname using sysupgrade, which is 'stg212' and imho should stay
that way.
The changes r48337 made for pogoplug-pro and pogoplug-v3 were correct,
thus this commit only partially reverts r48337.
Also properly set default for USB LED while already at it.

Signed-off-by: Daniel Golle <daniel@makrotopia.org>

SVN-Revision: 48398
2016-01-20 19:11:48 +00:00
Felix Fietkau
2e7b00069a oxnas: switch to Linux 4.4
Signed-off-by: Daniel Golle <daniel@makrotopia.org>

SVN-Revision: 48340
2016-01-18 23:35:05 +00:00
Felix Fietkau
89d37aaa5c oxnas: add patches and config for Linux 4.4
Signed-off-by: Daniel Golle <daniel@makrotopia.org>

SVN-Revision: 48339
2016-01-18 23:34:59 +00:00
Felix Fietkau
cee6c07cf3 oxnas: prepare platform and drivers for Linux 4.4
Signed-off-by: Daniel Golle <daniel@makrotopia.org>

SVN-Revision: 48338
2016-01-18 23:34:51 +00:00
Felix Fietkau
354e5cdbe2 oxnas: fix the incorrect board names
Signed-off-by: Shonn Lu <countrysideboy@qq.com>
Acked-by: Daniel Golle <daniel@makrotopia.org>

SVN-Revision: 48337
2016-01-18 23:34:42 +00:00
Jo-Philipp Wich
67e1c87012 all: drop old uci-defaults.sh
Replace former uci-defaults.sh implementation with the uci-defaults-new.sh one
and update all users accordingly.

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>

SVN-Revision: 47867
2015-12-11 15:26:06 +00:00
John Crispin
4223e47c19 oxnas: set irq of usb&sata to cpu1
V2:
The KD-20 also has USB 3.0.I modiy the set_irq_affinity usb 2 to set_irq_affinity ?hci_hcd 2 to bind usb 2.0&3.0 to cpu1.

Signed-off-by: Shonn Lu <countrysideboy@qq.com>

SVN-Revision: 47618
2015-11-24 18:29:14 +00:00
John Crispin
a46292c0dc oxnas: add missing platform bindings for stmmac glue
r47218 was missing needed changes which were accidentally
ommitted from the patch.

This should fix #20878

Signed-off-by: Daniel Golle <daniel@makrotopia.org>

SVN-Revision: 47552
2015-11-21 21:24:03 +00:00
Felix Fietkau
ea23d796f6 oxnas: image: Remove custom mkfs targz override as base should be fine now
It was wrong anyway, missing file sort order parameter which was fixed
in base month ago.

Signed-off-by: Petr Štetiar <ynezz@true.cz>

SVN-Revision: 47314
2015-10-31 09:28:42 +00:00
Felix Fietkau
74d9ef96f1 oxnas: image: Refactor sanitize_profile_name using PROFILE_SANITIZED variable
Signed-off-by: Petr Štetiar <ynezz@true.cz>

SVN-Revision: 47310
2015-10-31 09:28:05 +00:00
Hauke Mehrtens
da94b00df5 kernel: update kernel 4.1 to version 4.1.11
https://www.kernel.org/pub/linux/kernel/v4.x/ChangeLog-4.1.11

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>

SVN-Revision: 47252
2015-10-25 17:32:01 +00:00
John Crispin
6944a95091 oxnas: move gmac soc glue from mach to stmmac driver
Still a lot of kernel-version ifdef'ery, but imho that's easy to remove
once obsoleted and avoids duplicate code in the meantime.

Signed-off-by: Daniel Golle <daniel@makrotopia.org>

SVN-Revision: 47218
2015-10-19 10:09:36 +00:00
John Crispin
54b8ddf9e7 oxnas: prepare pinctrl for kernel >=4.2
Signed-off-by: Daniel Golle <daniel@makrotopia.org>

SVN-Revision: 47217
2015-10-19 10:09:30 +00:00
John Crispin
26329f650c oxnas: prepare irqchip driver for kernel >=4.2
Signed-off-by: Daniel Golle <daniel@makrotopia.org>

SVN-Revision: 47216
2015-10-19 10:09:23 +00:00
John Crispin
392b93f579 oxnas: fix duplicate include in clk-oxnas
Signed-off-by: Daniel Golle <daniel@makrotopia.org>

SVN-Revision: 47215
2015-10-19 10:09:16 +00:00
John Crispin
ec9ffe892f oxnas: remove obsolete __cpuinit
Signed-off-by: Daniel Golle <daniel@makrotopia.org>

SVN-Revision: 47214
2015-10-19 10:09:07 +00:00
Hauke Mehrtens
0cd478518f kernel: update 4.1 to 4.1.10
Fixes a regression on spi flash devices (upstream commit 1583eaece6fa).

Changelogs:
* https://www.kernel.org/pub/linux/kernel/v4.x/ChangeLog-4.1.7
* https://www.kernel.org/pub/linux/kernel/v4.x/ChangeLog-4.1.8
* https://www.kernel.org/pub/linux/kernel/v4.x/ChangeLog-4.1.9
* https://www.kernel.org/pub/linux/kernel/v4.x/ChangeLog-4.1.10

096-ipv4-off-by-one-in-continuation-handling-in-proc-net.patch was applied
upstream and dropped.

Signed-off-by: Mathias Kresin <openwrt@kresin.me>
[update from 4.1.9 to 4.1.10]
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>

SVN-Revision: 47104
2015-10-04 11:34:39 +00:00
Rafał Miłecki
ce7f25066b oxnas: add platform_pre_upgrade for sysupgrade
We're in process of cleaning nand_do_platform_check. Currently it leaves
a special mark in /tmp/sysupgrade-nand-path triggering some diffent code
path in nand_upgrade_stage1. This can be a bit confusing.

The plan is to have the check function only check the image and nothing
else. Then platform code (platform_pre_upgrade) should trigger NAND
specific upgrade path. This is what this patch implements.

This follows all other targets making it finally possible to change
nand_do_platform_check.

Signed-off-by: Rafał Miłecki <zajec5@gmail.com>

SVN-Revision: 47039
2015-09-24 09:18:59 +00:00
Rafał Miłecki
a25fbb5c9a oxnas: drop some unused sysupgrade code
First of all platform_do_upgrade_phase2 doesn't seem to be defined
anywhere. Other than that platform_do_upgrade is not likely to be ever
called. There is a call to nand_do_platform_check which triggers
nand_upgrade_stage1 call with "exit 0" in it.

Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
Acked-by: Daniel Golle <daniel@makrotopia.org>

SVN-Revision: 47038
2015-09-24 09:18:47 +00:00
Jonas Gorski
2d379e796f kernel: update 4.1 to 4.1.6
Changelog:
* https://www.kernel.org/pub/linux/kernel/v4.x/ChangeLog-4.1.6

Signed-off-by: Jonas Gorski <jogo@openwrt.org>

SVN-Revision: 46713
2015-08-23 18:06:11 +00:00
John Crispin
9b531bcab1 oxnas: remove support for kernel 3.18 and 4.0
Signed-off-by: Daniel Golle <daniel@makrotopia.org>

SVN-Revision: 46668
2015-08-17 11:25:46 +00:00
John Crispin
9b94521a46 oxnas: switch to kernel 4.1
Signed-off-by: Daniel Golle <daniel@makrotopia.org>

SVN-Revision: 46637
2015-08-17 06:04:02 +00:00
John Crispin
7261fde797 oxnas: prepare for kernel 4.1
Signed-off-by: Daniel Golle <daniel@makrotopia.org>

SVN-Revision: 46636
2015-08-17 06:03:57 +00:00
Jonas Gorski
bed330204a image.mk: move KDIR_TMP definition to a central location
Instead of each target defining it the same, move the KDIR_TMP
definition to include/image.mk. In addition Image/Build/SysupgradeNAND
already requires KDIR_TMP to be set, so it makes sense to have it
globally defined.

Signed-off-by: Jonas Gorski <jogo@openwrt.org>

SVN-Revision: 46592
2015-08-14 10:20:53 +00:00
Hauke Mehrtens
0b8643af4f kernel: update 3.18 to 3.18.20
Changelog:
 * https://www.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.18.20

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>

SVN-Revision: 46570
2015-08-09 11:09:52 +00:00
Jonas Gorski
831d1c8b45 kernel: update 4.0 to 4.0.7
Changelog:
* https://www.kernel.org/pub/linux/kernel/v4.x/ChangeLog-4.0.6
* https://www.kernel.org/pub/linux/kernel/v4.x/ChangeLog-4.0.7

Signed-off-by: Jonas Gorski <jogo@openwrt.org>

SVN-Revision: 46151
2015-06-30 23:26:13 +00:00
Jonas Gorski
901a7fa067 kernel: update 3.18 to 3.18.17
Changelog:
* https://www.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.18.17

Signed-off-by: Jonas Gorski <jogo@openwrt.org>

SVN-Revision: 46150
2015-06-30 23:26:09 +00:00
Jonas Gorski
0f5b1a3eca kernel: update 4.0 to 4.0.5
Changelog:
* https://www.kernel.org/pub/linux/kernel/v4.x/ChangeLog-4.0.5

Signed-off-by: Jonas Gorski <jogo@openwrt.org>

SVN-Revision: 46063
2015-06-19 11:12:43 +00:00
Jonas Gorski
9a59b350b7 kernel: update 3.18 to 3.18.16
Changelogs:

* https://www.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.18.15
* https://www.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.18.16

Signed-off-by: Jonas Gorski <jogo@openwrt.org>

SVN-Revision: 46011
2015-06-17 09:54:55 +00:00
Felix Fietkau
c41a1affb8 oxnas: change file extension of u-boot+initramfs image
The *u-boot-initramfs* images are not ITB/FIT images but are rather
supposed to be loaded to RAM and jumped-into.
To avoid confusion, change the file extension from itb to bin.

Signed-off-by: Daniel Golle <daniel@makrotopia.org>

SVN-Revision: 45963
2015-06-14 17:42:00 +00:00
Jonas Gorski
76d079204d kernel: update 3.18 to 3.18.14
Changelogs:

* https://www.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.18.12
* https://www.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.18.13
* https://www.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.18.14

Build tested on brcm63xx and ipq806x, runtested on brcm63xx.

Signed-off-by: Jonas Gorski <jogo@openwrt.org>

SVN-Revision: 45711
2015-05-21 19:32:46 +00:00
Jonas Gorski
954004eccc kernel: disable INET_LRO by default
INET_LRO deprecated and there are exactly two drivers using it, neither
being included in any of the targets enabling INET_LRO. At the same time
both drivers needing it select it.

So just disable it for everyone.

Signed-off-by: Jonas Gorski <jogo@openwrt.org>

SVN-Revision: 45584
2015-04-28 13:31:08 +00:00
John Crispin
35c52bc261 oxnas: remove pre kernel 3.18 support from pinctrl driver
just some pruning...

Signed-off-by: Daniel Golle <daniel@makrotopia.org>

SVN-Revision: 44923
2015-03-21 21:47:20 +00:00
John Crispin
3256194aff oxnas: add support for kernel 4.0
Signed-off-by: Daniel Golle <daniel@makrotopia.org>

SVN-Revision: 44922
2015-03-21 21:47:03 +00:00
John Crispin
a992489e4b oxnas: drop 3.14 support
Signed-off-by: John Crispin <blogic@openwrt.org>

SVN-Revision: 44819
2015-03-16 07:40:54 +00:00
John Crispin
d15ac306fa kernel: move KERNFS to generic config
KERNFS symbol is selected by SYSFS, so place it in generic config.

Signed-off-by: Sergey Ryazanov <ryazanov.s.a@gmail.com>

SVN-Revision: 44615
2015-03-06 07:56:47 +00:00
John Crispin
f04a268a04 kernel: disable ARCH_NEEDS_CPU_IDLE_COUPLED
Disable ARCH_NEEDS_CPU_IDLE_COUPLED by-default in generic config, since
only one platfrom (omap) needs them.

Signed-off-by: Sergey Ryazanov <ryazanov.s.a@gmail.com>

SVN-Revision: 44614
2015-03-06 07:56:34 +00:00
John Crispin
5a8d78d710 oxnas: fix itb generation
- according to imx6 Makefile and u-Boot documentation is itb
  and probably should not be changed
- this fixes build error if CONFIG_TARGET_ROOTFS_INCLUDE_FIT is set
  (missing .itb file)
- use DTS_DIR (like in imx6 Makefile)

only compile tested

Signed-off-by: Dirk Neukirchen <dirkneukirchen@web.de>
Acked-by: Daniel Golle <daniel@makrotopia.org>

SVN-Revision: 44468
2015-02-16 21:18:48 +00:00
John Crispin
1aaa72103b oxnas: disable usbgadget support
usbgadget was initially enabled in the hope to support gadget mode
as it seems to be supported by the hardware.
However, it currently breaks things and doesn't work anyway, so
remove the usbgadget feature.

Signed-off-by: Daniel Golle <daniel@makrotopia.org>

SVN-Revision: 44407
2015-02-11 13:50:56 +00:00
John Crispin
69c160d867 oxnas: switch to 3.18
Tested on stg212 and kd20.

Signed-off-by: Daniel Golle <daniel@makrotopia.org>

SVN-Revision: 44374
2015-02-10 05:52:48 +00:00
John Crispin
ba1904056d oxnas: copy ubinized images to binary folder
Since r43778 ubinized images are stored inside KDIR. This makes sense
when using an uninized image to generate a factory image.
On oxnas ubinized images were used for sysupgrade before proper NAND
support was implemented in OpenWrt.
For users still on old builds before sysupgrade.tar was introduced,
ubinized image is thus the only option to conveniantly upgrade to a
more recent build.
Copy ubinized image also to BIN_DIR, so it will be easier for users
to find them.

Signed-off-by: Daniel Golle <daniel@makrotopia.org>

SVN-Revision: 44357
2015-02-09 12:16:04 +00:00
Luka Perkov
81db848656 targets: base-files: diag.sh does not need to be executable
Signed-off-by: Luka Perkov <luka@openwrt.org>

SVN-Revision: 44305
2015-02-07 19:58:58 +00:00
Felix Fietkau
0f0460afda oxnas: re-enable ubifs
After the changes make ubinize.cfg optional in image.mk, ubifs
generation can now safely be enabled again.

Signed-off-by: Daniel Golle <daniel@makrotopia.org>

SVN-Revision: 43789
2014-12-27 13:03:26 +00:00
Felix Fietkau
2ef587a8fc oxnas: clk-oxnas: rework pllb enable function
kernel lock debugging unveiled that we should not call
of_reset_control_get inside a clock's enable operation (see below)

move of_reset_control_* previously used in pllb_clk_enable to new
pllb_clk_prepare and pllb_clk_unprepare functions.
use a container to carry runtime information.

------------[ cut here ]------------
WARNING: CPU: 0 PID: 1 at kernel/locking/lockdep.c:2742 lockdep_trace_alloc+0xb8/0xfc()
DEBUG_LOCKS_WARN_ON(irqs_disabled_flags(flags))
Modules linked in:
CPU: 0 PID: 1 Comm: swapper/0 Not tainted 3.14.26 #6
[<c001a6ac>] (unwind_backtrace) from [<c0016dec>] (show_stack+0x10/0x14)
[<c0016dec>] (show_stack) from [<c0194f68>] (dump_stack+0x7c/0x94)
[<c0194f68>] (dump_stack) from [<c0021b50>] (warn_slowpath_common+0x68/0x8c)
[<c0021b50>] (warn_slowpath_common) from [<c0021ba4>] (warn_slowpath_fmt+0x30/0x40)
[<c0021ba4>] (warn_slowpath_fmt) from [<c0061b30>] (lockdep_trace_alloc+0xb8/0xfc)
[<c0061b30>] (lockdep_trace_alloc) from [<c00cb740>] (kmem_cache_alloc+0x1c/0xf8)
[<c00cb740>] (kmem_cache_alloc) from [<c01d33c8>] (of_reset_control_get+0xe8/0x12c)
[<c01d33c8>] (of_reset_control_get) from [<c0269228>] (pllb_clk_enable+0x14/0xbc)
[<c0269228>] (pllb_clk_enable) from [<c0265738>] (__clk_enable+0x54/0xa0)
[<c0265738>] (__clk_enable) from [<c0265acc>] (clk_enable+0x18/0x2c)
[<c0265acc>] (clk_enable) from [<c04325f8>] (oxnas_pcie_probe+0x3b8/0x6a0)
[<c04325f8>] (oxnas_pcie_probe) from [<c01f2510>] (platform_drv_probe+0x18/0x48)
[<c01f2510>] (platform_drv_probe) from [<c01f1070>] (driver_probe_device+0xd8/0x24c)
[<c01f1070>] (driver_probe_device) from [<c01f1298>] (__driver_attach+0x70/0x94)
[<c01f1298>] (__driver_attach) from [<c01ef728>] (bus_for_each_dev+0x4c/0x98)
[<c01ef728>] (bus_for_each_dev) from [<c01f0818>] (bus_add_driver+0xcc/0x1e8)
[<c01f0818>] (bus_add_driver) from [<c01f169c>] (driver_register+0xa0/0xe8)
[<c01f169c>] (driver_register) from [<c01f2568>] (platform_driver_probe+0x20/0xa4)
[<c01f2568>] (platform_driver_probe) from [<c0013a3c>] (do_one_initcall+0x90/0x140)
[<c0013a3c>] (do_one_initcall) from [<c0421d38>] (kernel_init_freeable+0x1e4/0x2c0)
[<c0421d38>] (kernel_init_freeable) from [<c000c214>] (kernel_init+0x8/0x104)
[<c000c214>] (kernel_init) from [<c0008768>] (ret_from_fork+0x14/0x2c)
---[ end trace 5f17ed2f61e0683f ]---

Signed-off-by: Daniel Golle <daniel@makrotopia.org>

SVN-Revision: 43787
2014-12-27 13:03:12 +00:00
Felix Fietkau
93192e65e8 oxnas: sata_oxnas: make irq handler more readable
safed one level of indention by using 'continue' instead of a
lengthy if-clause.

Signed-off-by: Daniel Golle <daniel@makrotopia.org>
v2: use logic-AND instead of '?' operator when checking for hw bug 6320

SVN-Revision: 43768
2014-12-22 20:47:10 +00:00
Felix Fietkau
74a9e1c1b0 oxnas: sata_oxnas: refactoring phase 2
- replaced // comments by /* comments */
 - added line-breaks where needed
 - fixed white-space according to kernel style
 - fixed some obvious spelling mistakes in comments and printks
 - removed some unneeded left-overs imported from vendor code-base
 - replaced printk(...) by libata macros where possible

Signed-off-by: Daniel Golle <daniel@makrotopia.org>

SVN-Revision: 43767
2014-12-22 20:47:01 +00:00
Felix Fietkau
feda47451f oxnas: sata_oxnas: refactoring phase 1
locking for 2nd port and hwraid was added from vendor's GPL code which
doesn't comply with current kernel coding style.

 - moved all global variables into host_priv
 - renamed locks
 - sanetized acquire() and release() parameter list

Signed-off-by: Daniel Golle <daniel@makrotopia.org>

SVN-Revision: 43766
2014-12-22 20:46:49 +00:00