Commit graph

26 commits

Author SHA1 Message Date
Daniel Golle
217fe505b6 oxnas: remove superseded sysupgrade image check
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
2018-11-08 14:41:42 +01:00
Daniel Golle
4f017c871d oxnas: switch to generic board detect
remove /lib/oxnas.sh platform-specific board-detection and use
generic which is based on device-tree compatible node instead.

Signed-off-by: Daniel Golle <daniel@makrotopia.org>
2018-11-04 21:43:36 +01:00
Daniel Golle
dcc34574ef oxnas: bring in new oxnas target
Reboot the oxnas target based on Linux 4.14 by rebasing our support on
top of the now-existing upstream kernel support.
This commit brings oxnas support to the level of v4.17 having upstream
drivers for Ethernet, Serial and NAND flash.
Botch up OpenWrt's local drivers for EHCI, SATA and PCIe based on the
new platform code and device-tree.
Re-introduce base-files from old oxnas target which works for now but
needs further clean-up towards generic board support.

Functional issues:
 * PCIe won't come up (hence no USB3 on Shuttle KD20)
 * I2C bus of Akitio myCloud device is likely not to work (missing
   debounce support in new pinctrl driver)

Code-style issues:
 * plla/pllb needs further cleanup -- currently their users or writing
   into the syscon regmap after acquireling the clk instead of using
   defined clk_*_*() functions to setup multipliers and dividors.
 * PCIe phy needs its own little driver.
 * SATA driver is a monster and should be split into an mfd having
   a raidctrl regmap, sata controller, sata ports and sata phy.

Tested on MitraStar STG-212 aka. Medion Akoya MD86xxx and Shuttle KD20.

Signed-off-by: Daniel Golle <daniel@makrotopia.org>
2018-06-01 15:45:06 +02:00
Daniel Golle
17511a7ea8 oxnas: kill old oxnas target
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
2018-06-01 15:45:06 +02:00
Mathias Kresin
188328111b treewide: move nand_do_upgrade call to platform_do_upgrade
Calling nand_do_upgrade() from platform_pre_upgrade() was deprecated
with 30f61a34b4 ("base-files: always use staged sysupgrade").

Update the platform upgrade code to use platform_do_upgrade() for NAND
images as well.

Signed-off-by: Mathias Kresin <dev@kresin.me>
2018-02-16 14:44:02 +01:00
Mathias Kresin
c4ac02ffca treewide: remove obsolete sysupgrade watchdog kill
The watchdog kill command was meant for busybox watchdog. Busybox watchdog
was replaced by the procd watchdog mid 2013 with commit df7ce9301a
("busybox: disable the watchdog utility by default"), which makes the kill
command obsolete since quite some time.

Signed-off-by: Mathias Kresin <dev@kresin.me>
2018-02-16 14:44:02 +01:00
Mathias Kresin
e0b9ec8e96 treewide: drop target board_name functions
They are not used any longer.

Signed-off-by: Mathias Kresin <dev@kresin.me>
2017-07-15 23:13:34 +02:00
Mathias Kresin
f12a32630f treewide: use the generic board_name function
Use the generic function instead ot the target specific ones.

Signed-off-by: Mathias Kresin <dev@kresin.me>
2017-07-15 23:13:34 +02:00
Mathias Kresin
ac3e05c5d7 treewide: populate boardname and model earlier
For targets using the generic board detection and board specific
settings in diag.sh, the board name is still unset at the time the
set_state() provided by diag.sh is called by 10_indicate_preinit.

Change the execution order to ensure the boardname is populated before
required the first time. Do the target specific board detection as
early as possible, directly followed by the generic one to allow a
seamless switch to the generic function for populating /tmp/sysinfo/.

Signed-off-by: Mathias Kresin <dev@kresin.me>
2017-07-15 23:13:34 +02:00
Daniel Golle
69903c3ee6 oxnas: require image metadata
Now that we generate images with metadata attached, require it in order
to prevent accidentally flashing the wrong image to a board.

Signed-off-by: Daniel Golle <daniel@makrotopia.org>
2017-01-07 14:47:04 +01:00
Mathias Kresin
c1578d4fc9 cleanup ucidef_set_interface* usage
- quote the interface name
- remove call of not existing function
- remove the proto if it's the default proto

Signed-off-by: Mathias Kresin <dev@kresin.me>
2016-09-10 15:32:25 +02:00
Daniel Golle
9c69ba83e2 oxnas: add method to extract mac_adr from legacy cmdline
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
2016-09-04 04:58:46 +02:00
Daniel Golle
bb20164c8f oxnas: drop explicit pre-init iface
According to Jonas Gorski this is no longer needed, the problem
originally addressed by first adding 07_preinit_iface and subsequently
merging that into 02_network was probably a bug during the transition
to the new board.d pre-init approach.

Signed-off-by: Daniel Golle <daniel@makrotopia.org>
2016-08-22 14:31:07 +02:00
Daniel Golle
f71f7f0df1 oxnas: set preinit interface in /etc/board.d/02_network
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
2016-08-19 17:53:50 +02:00
Daniel Golle
a9b1a429ab oxnas: set preinit network interface
set network interface for failsafe mode to eth0 for all boards

Signed-off-by: Daniel Golle <daniel@makrotopia.org>
2016-08-11 17:16:03 +02:00
Daniel Golle
8880497382 oxnas: use DHCP by default on ethernet interface (lan)
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
2016-07-18 19:37:43 +02:00
Hauke Mehrtens
012da658a4 oxnas: add support for Akitio MyCloud mini
Signed-off-by: Daniel Golle <daniel@makrotopia.org>

SVN-Revision: 49197
2016-04-19 20:12: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
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
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
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
John Crispin
019ea725aa add "preinit_regular" diag.sh set_state argument
This new argument is used right after starting regular preinit (which
happens if failsafe wasn't triggered). The main purpose of "preinit"
argument is to indicate that failsafe can be triggered, however we were
missing a way to inform user that we don't wait for a trigger anymore.
With this change it's clear when failsafe mode can be triggered.

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

SVN-Revision: 43715
2014-12-15 10:37:00 +00:00
John Crispin
72b58f2eb1 add new target 'oxnas'
This is the oxnas target previously developed at
http://gitorious.org/openwrt-oxnas
Basically, this consolidates the changes and addtionas from
http://github.org/kref/linux-oxnas
into a new OpenWrt hardware target 'oxnas' adding support for
 PLX Technology NAS7820/NAS7821/NAS7825/...
formally known as
 Oxford Semiconductor OXE810SE/OXE815/OX820/...

For now there are 4 supported boards:
Cloud Engines Pogoplug V3 (without PCIe)
 fully supported

Cloud Engines Pogoplug Pro (with PCIe)
 fully supported

MitraStar STG-212
 aka ZyXEL NSA-212,
 aka Medion Akoya P89625 / P89636 / P89626 / P89630,
 aka Medion MD 86407 / MD 86805 / MD 86517 / MD 86587
 fully supported, see http://wiki.openwrt.org/toh/medion/md86587

Shuttle KD-20
 partially supported (S-ATA driver lacks support for 2nd port)

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

SVN-Revision: 43388
2014-11-26 09:00:08 +00:00