Re: updating Sheevaplug and Openrd patches for u-boot v2014.07
On Fri, Jul 11, 2014 at 05:47:18AM +0200, drEagle wrote: On 10/07/2014 21:30, Vagrant Cascadian wrote: On Thu, Jul 10, 2014 at 09:04:49AM +0200, drEagle wrote: openrd_ultimate still fails to build: You need to add #define CONFIG_GENERIC_MMC inside the MMC block of the config file. Here is a compiling .diff for openrd Indeed! Thanks! Looks like there are still a *lot* of build warnings from the mvsata diff and a few from the mmc... might upload to experimental anyways to make it easier for testers. live well, vagrant signature.asc Description: Digital signature
Re: updating Sheevaplug and Openrd patches for u-boot v2014.07
Looks like there are still a *lot* of build warnings from the mvsata diff
and a few from the mmc... might upload to experimental anyways to make it
easier for testers.
The MVSDIO need some cleanings before been proposed upstream (again).
For now, two new updated patchs for testing.
Still 2 warnings from unused functions with this one.
Enjoy,
Gérald
diff --git a/include/configs/sheevaplug.h b/include/configs/sheevaplug.h
index afba340..cdb4b45 100644
--- a/include/configs/sheevaplug.h
+++ b/include/configs/sheevaplug.h
@@ -32,6 +32,7 @@
#include config_cmd_default.h
#define CONFIG_CMD_DHCP
#define CONFIG_CMD_ENV
+#define CONFIG_CMD_IDE
#define CONFIG_CMD_MII
#define CONFIG_CMD_MMC
#define CONFIG_CMD_NAND
@@ -110,4 +111,15 @@
#define CONFIG_CMD_MTDPARTS
#define CONFIG_LZO
+/*
+ * SATA driver configuration
+ */
+#ifdef CONFIG_CMD_IDE
+#define __io
+#define CONFIG_IDE_PREINIT
+#define CONFIG_DOS_PARTITION
+#define CONFIG_MVSATA_IDE_USE_PORT0
+#define CONFIG_SYS_ATA_IDE0_OFFSET MV_SATA_PORT0_OFFSET
+#endif /* CONFIG_CMD_IDE */
+
#endif /* _CONFIG_SHEEVAPLUG_H */
diff --git a/arch/arm/cpu/arm926ejs/kirkwood/cpu.c b/arch/arm/cpu/arm926ejs/kirkwood/cpu.c
index d4711c0..a6e18ff 100644
--- a/arch/arm/cpu/arm926ejs/kirkwood/cpu.c
+++ b/arch/arm/cpu/arm926ejs/kirkwood/cpu.c
@@ -334,6 +334,64 @@ int arch_cpu_init(void)
}
#endif /* CONFIG_ARCH_CPU_INIT */
+/*
+ * General
+ /
+#if defined(CONFIG_ARCH_DEV_ID)
+
+void kirkwood_pcie_id(u32 *dev, u32 *rev)
+{
+ *dev = (readl(KW_REG_PCIE_DEVID) 16) 0x;
+ *rev = readl(KW_REG_PCIE_REVID) 0xff;
+}
+
+/*
+ * Identify device ID and revision.
+ */
+char *kirkwood_id(void)
+{
+ u32 dev, rev;
+
+ kirkwood_pcie_id(dev, rev);
+
+ if (dev == MV88F6281_DEV_ID) {
+ if (rev == MV88F6281_REV_Z0)
+ return MV88F6281-Z0;
+ else if (rev == MV88F6281_REV_A0)
+ return MV88F6281-A0;
+ else if (rev == MV88F6281_REV_A1)
+ return MV88F6281-A1;
+ else
+ return MV88F6281-Rev-Unsupported;
+ } else if (dev == MV88F6192_DEV_ID) {
+ if (rev == MV88F6192_REV_Z0)
+ return MV88F6192-Z0;
+ else if (rev == MV88F6192_REV_A0)
+ return MV88F6192-A0;
+ else if (rev == MV88F6192_REV_A1)
+ return MV88F6192-A1;
+ else
+ return MV88F6192-Rev-Unsupported;
+ } else if (dev == MV88F6180_DEV_ID) {
+ if (rev == MV88F6180_REV_A0)
+ return MV88F6180-Rev-A0;
+ else if (rev == MV88F6180_REV_A1)
+ return MV88F6180-Rev-A1;
+ else
+ return MV88F6180-Rev-Unsupported;
+ } else if (dev == MV88F6282_DEV_ID) {
+ if (rev == MV88F6282_REV_A0)
+ return MV88F6282-Rev-A0;
+ else if (rev == MV88F6282_REV_A1)
+ return MV88F6282-Rev-A1;
+ else
+ return MV88F6282-Rev-Unsupported;
+ } else {
+ return Device-Unknown;
+ }
+}
+#endif /* CONFIG_ARCH_DEV_ID */
+
/*
* SOC specific misc init
*/
diff --git a/arch/arm/include/asm/arch-kirkwood/config.h b/arch/arm/include/asm/arch-kirkwood/config.h
index 7a688e4..1fe383d 100644
--- a/arch/arm/include/asm/arch-kirkwood/config.h
+++ b/arch/arm/include/asm/arch-kirkwood/config.h
@@ -19,6 +19,8 @@
#include asm/arch/kw88f6281.h
#elif defined (CONFIG_KW88F6192)
#include asm/arch/kw88f6192.h
+#elif defined (CONFIG_KW88F6182)
+#include asm/arch/kw88f6182.h
#else
#error SOC Name not defined
#endif /* CONFIG_KW88F6281 */
diff --git a/arch/arm/include/asm/arch-kirkwood/cpu.h b/arch/arm/include/asm/arch-kirkwood/cpu.h
index 97daa40..e7b6448 100644
--- a/arch/arm/include/asm/arch-kirkwood/cpu.h
+++ b/arch/arm/include/asm/arch-kirkwood/cpu.h
@@ -151,5 +151,7 @@ int kw_config_mpp(unsigned int mpp0_7, unsigned int mpp8_15,
unsigned int mpp32_39, unsigned int mpp40_47,
unsigned int mpp48_55);
unsigned int kw_winctrl_calcsize(unsigned int sizeval);
+void kirkwood_pcie_id(u32 *dev, u32 *rev);
+char *kirkwood_id(void);
#endif /* __ASSEMBLY__ */
#endif /* _KWCPU_H */
diff --git a/arch/arm/include/asm/arch-kirkwood/kirkwood.h b/arch/arm/include/asm/arch-kirkwood/kirkwood.h
index bc207f5..8f4b10b 100644
--- a/arch/arm/include/asm/arch-kirkwood/kirkwood.h
+++ b/arch/arm/include/asm/arch-kirkwood/kirkwood.h
@@ -39,6 +39,7 @@
#define KW_EGIGA0_BASE (KW_REGISTER(0x72000))
#define KW_EGIGA1_BASE (KW_REGISTER(0x76000))
#define KW_SATA_BASE (KW_REGISTER(0x8))
+#define KW_SDIO_BASE (KW_REGISTER(0x9))
/* Kirkwood Sata controller has two ports */
#define KW_SATA_PORT0_OFFSET 0x2000
@@ -61,10 +62,33 @@
#define MVCPU_WIN_ENABLE KWCPU_WIN_ENABLE
#define MVCPU_WIN_DISABLE KWCPU_WIN_DISABLE
+/*
+ * Supported devices and revisions.
+ */
+#define MV88F6281_DEV_ID 0x6281
+#define MV88F6281_REV_Z0 0
+#define MV88F6281_REV_A0 2
+#define MV88F6281_REV_A1 3
+
+#define MV88F6192_DEV_ID 0x6192
+#define MV88F6192_REV_Z0 0
+#define MV88F6192_REV_A0 2
+#define MV88F6192_REV_A1 3
+
+#define MV88F6180_DEV_ID 0x6180
+#define MV88F6180_REV_A0 2
+#define MV88F6180_REV_A1 3
+
+#define
Re: updating Sheevaplug and Openrd patches for u-boot v2014.07
Out Of Topic;
What do you think about addind Hush Shell [1] to sheevaplugs ?
Enabling Sheevaplug with script command line parser.
[1] http://www.denx.de/wiki/view/DULG/CommandLineParsing
Enjoy,
Gérald
diff --git a/include/configs/sheevaplug.h b/include/configs/sheevaplug.h
index cdb4b45..b0671ae 100644
--- a/include/configs/sheevaplug.h
+++ b/include/configs/sheevaplug.h
@@ -64,6 +64,14 @@
#define CONFIG_ENV_OFFSET 0x8 /* env starts here */
/*
+ * Enable scripting function
+ */
+#undef CONFIG_SYS_MAXARGS
+#define CONFIG_SYS_MAXARGS 64 /* max number of command args */
+#define CONFIG_SYS_HUSH_PARSER /* Enable the hush shell */
+#define CONFIG_SYS_PROMPT_HUSH_PS2
+
+/*
* Default environment variables
*/
#define CONFIG_BOOTCOMMAND ${x_bootcmd_kernel}; \
signature.asc
Description: OpenPGP digital signature
Re: updating Sheevaplug and Openrd patches for u-boot v2014.07
Off topic, but... wondering if CONFIG_EFI_PARTITION is standard now-a-days? It works for 2013-10 on the ESATA SheevaPlug. Been using it on a 3TB Hardware Raid 5 for 6 or so months. Like to see that option on by default. -- John Holland
Re: updating Sheevaplug and Openrd patches for u-boot v2014.07
On Fri, 2014-07-11 at 09:44 +0200, John Holland wrote: Off topic, but... wondering if CONFIG_EFI_PARTITION is standard now-a-days? It's part of include/config_distro_defaults.h so any board which has opted into that should have it. But someone was reporting the other day on debian-arm that it didn't seem to work on sunxi, which has opted in, so perhaps there is more to it. Ian. -- To UNSUBSCRIBE, email to debian-arm-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org Archive: https://lists.debian.org/1405067531.3773.1.ca...@hastur.hellion.org.uk
Re: Information needed from owners/users of Debian on ARM/kirkwood base QNAP devices (should take 1min to gather)
2014-06-17 10:49 GMT+03:00 Ian Campbell i...@hellion.org.uk: TL;DR: Please run the attached kirkwood-qnap script on your ARM based QNAP systems as ./kirkwood-qnap --info and report the results in this thread along with the model/kind of your QNAP device (as precisely as you can). QNAP TS-221 (2.0GHz, 1GB RAM - http://www.qnap.com/en/index.php?lang=ensn=822c=351sc=514t=523n=18375g=1): $ ./kirkwood-qnap --info Kernel:Linux verkko 3.2.0-4-kirkwood #1 Debian 3.2.54-2 armv5tel GNU/Linux cpuinfo:Hardware: QNAP TS-119/TS-219 dt model:n/a PCI devices: 00:00.0 0600: 11ab:6282 (rev 01) 00:01.0 0106: 197b:2363 (rev 03) 00:01.1 0101: 197b:2363 (rev 03) 01:00.0 0600: 11ab:6282 (rev 01) 01:01.0 0c03: 1b6f:7023 (rev 01) PHY devices (/sys/bus/mdio_bus/devices/): 0:00 Soc Bus:n/a QNAP TS-119/TS-219 kirkwood-qnap: machine: QNAP TS-119/TS-219 kirkwood-qnap: success: PCI = kirkwood-ts219-6282.dtb kirkwood-qnap: success: PHY = kirkwood-ts219-6282.dtb -Timo -- To UNSUBSCRIBE, email to debian-arm-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org Archive: https://lists.debian.org/CAJtFfxkjKWB_CBw4wfVYEy-ZfgU7JNS7Uwp+7bYd=rhgrvu...@mail.gmail.com
Re: flash-kernel and dtb
Control: tags 751816 patch
On Tue, Jul 08, 2014 at 08:03:30PM +0100, Ian Campbell wrote:
I think the patch below resolves the worst issue and it works for me on
cubietruck.
The more minor stuff mentioned in that report I'm not sure it is
actually worth worrying over. The main one seems to be
that /etc/default/flash-kernel:LINUX_KERNEL_CMDLINE is still populated
even on systems where there is no way at all for it to get used.
Thoughts on that?
Looks good to me.
The only improvement I might suggest is deleting the line entirely if
LINUX_KERNEL_CMDLINE isn't set, but that's a minor point. Would definitely like
to see the updated flash-kernel hit jessie soon!
Thanks!
live well,
vagrant
commit e141f15eb9b1804839752be98f895ef4c68969cd
Author: Ian Campbell i...@hellion.org.uk
Date: Sun Jul 6 16:52:10 2014 +0100
Append /etc/flash-kernel/default:LINUX_KERNEL_CMDLINE to bootargs.
Only for those platforms which set bootargs based on LINUX_KERNEL_COMMAND
line,
not those which set an unconditional/unconfigurable bootargs.
diff --git a/bootscript/bootscr.beaglebone b/bootscript/bootscr.beaglebone
index df8af94..a0e5121 100644
--- a/bootscript/bootscr.beaglebone
+++ b/bootscript/bootscr.beaglebone
@@ -2,7 +2,7 @@
setenv device mmc
setenv partition ${bootpart}
-setenv bootargs '@@LINUX_KERNEL_CMDLINE@@'
+setenv bootargs ${bootargs} @@LINUX_KERNEL_CMDLINE@@
image_locations='/boot/ /'
kvers='@@KERNEL_VERSION@@'
diff --git a/bootscript/bootscr.cubox-i b/bootscript/bootscr.cubox-i
index f8c69bb..e9b1b09 100644
--- a/bootscript/bootscr.cubox-i
+++ b/bootscript/bootscr.cubox-i
@@ -2,7 +2,7 @@
setenv device mmc
setenv partition ${mmcdev}:${mmcpart}
-setenv bootargs '@@LINUX_KERNEL_CMDLINE@@'
+setenv bootargs ${bootargs} @@LINUX_KERNEL_CMDLINE@@
image_locations='/boot/ /'
kvers='@@KERNEL_VERSION@@'
diff --git a/bootscript/bootscr.highbank b/bootscript/bootscr.highbank
index 6827b21..881bb3f 100644
--- a/bootscript/bootscr.highbank
+++ b/bootscript/bootscr.highbank
@@ -1,4 +1,4 @@
-setenv bootargs '@@LINUX_KERNEL_CMDLINE@@'
+setenv bootargs ${bootargs} @@LINUX_KERNEL_CMDLINE@@
@@UBOOT_ENV_EXTRA@@
ext2load scsi 0 ${kernel_addr_r} vmlinuz
ext2load scsi 0 ${ramdisk_addr_r} initrd.img
diff --git a/bootscript/bootscr.sunxi b/bootscript/bootscr.sunxi
index b2ffe50..16624a9 100644
--- a/bootscript/bootscr.sunxi
+++ b/bootscript/bootscr.sunxi
@@ -11,7 +11,7 @@ setenv kernel_addr_r 0x4600
setenv fdt_addr_r 0x4700
setenv ramdisk_addr_r 0x4800
-setenv bootargs '@@LINUX_KERNEL_CMDLINE@@'
+setenv bootargs ${bootargs} @@LINUX_KERNEL_CMDLINE@@
@@UBOOT_ENV_EXTRA@@
image_locations='/boot/ /'
diff --git a/bootscript/bootscr.wandboard b/bootscript/bootscr.wandboard
index 6e1a5c3..847c4ec 100644
--- a/bootscript/bootscr.wandboard
+++ b/bootscript/bootscr.wandboard
@@ -5,7 +5,7 @@ setenv partition ${mmcdev}:${mmcpart}
if test -z ${ramdiskaddr} ; then
setenv ramdiskaddr 0x1300
fi
-setenv bootargs '@@LINUX_KERNEL_CMDLINE@@'
+setenv bootargs ${bootargs} @@LINUX_KERNEL_CMDLINE@@
image_locations='/boot/ /'
kvers='@@KERNEL_VERSION@@'
diff --git a/bootscript/bootscr.xgene-mustang
b/bootscript/bootscr.xgene-mustang
index 23c8fa0..919a8e4 100644
--- a/bootscript/bootscr.xgene-mustang
+++ b/bootscript/bootscr.xgene-mustang
@@ -1,4 +1,4 @@
-setenv bootargs '@@LINUX_KERNEL_CMDLINE@@'
+setenv bootargs ${bootargs} @@LINUX_KERNEL_CMDLINE@@
@@UBOOT_ENV_EXTRA@@
ext4load scsi 0 ${kernel_addr_r} uImage
ext4load scsi 0 ${ramdisk_addr_r} uInitrd
diff --git a/debian/changelog b/debian/changelog
index ed1e883..f0a8f6f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,9 @@ flash-kernel (3.23) UNRELEASED; urgency=medium
* Avoid stalling install when debconf frontend is noninteractive. Patch
from
David Lechner. (Closes: #753059)
+ * Append command line options from
+/etc/default/flash-kernel:LINUX_KERNEL_CMDLINE to ${bootargs} rather than
+replacing it entirely. (Partially addresses #751816)
-- Ian Campbell i...@hellion.org.uk Sun, 06 Jul 2014 16:46:09 +0100
signature.asc
Description: Digital signature
