archlinuxarm/PKGBUILDs
1
0
Fork 0
mirror of https://github.com/archlinuxarm/PKGBUILDs.git synced 2025-01-27 23:44:04 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

alarm/uboot-kirkwood to 2016.03-1

Browse source
This commit is contained in:
moonman 2016-03-15 22:29:54 -06:00
parent 92ae96f86b
commit 29b0a99126
5 changed files with 89 additions and 99 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
alarm/uboot-kirkwood/PKGBUILD
View file

@ -6,8 +6,8 @@ buildarch=2
pkgbase=uboot-kirkwood
pkgname=('uboot-dockstar' 'uboot-goflexhome' 'uboot-goflexnet' 'uboot-pogo_e02' 'uboot-pogoplugv4' 'uboot-nsa310' 'uboot-nsa325' 'uboot-nsa320' 'uboot-guruplug' 'uboot-sheevaplug')
pkgver=2015.10
_commit=d4f9af1e9f4b30702ec6ea0f89e73c0b748bcf08
pkgver=2016.03
_commit=cf7543816fc825599ac9839d6559fc7d77bec4c0
pkgrel=1
arch=('arm')
url="https://github.com/archlinuxarm/u-boot"
@ -25,12 +25,12 @@ source=("https://github.com/moonman/u-boot/archive/${_commit}.tar.gz"
'uboot-guruplug.txt'
'uboot-sheevaplug.txt')
md5sums=('543b647a548912877e4322447cef852a'
md5sums=('887fa7c2858b2bce1293b312e0da0f7d'
'50f4cf74fc0993435f8b18d028a3c006'
'0a92d44729e81669525b0b4393974aa1'
'8d64678dacb49d191f5fba42045e0637'
'c4eae149aabd571c01b4ec38a1da3da0'
'7b19fdfdd7169f3c91684ff54d4d22cc'
'9364973bef95f54eff185f06f60350c5'
'60933ca914d393de2f5c4a2d3b21e394'
'56a342174c72513b71f58e41182c2204'
'88c86409d25bcac06bd7456d60258a34'

2
alarm/uboot-kirkwood/uboot-pogoplugv4.txt
View file

@ -7,7 +7,7 @@ console=ttyS0,115200
ethact=egiga0
fdtaddr=0x800000
fdtdir=/boot/dtbs
fdtfile=kirkwood-pogoplugv4.dtb
fdtfile=kirkwood-pogoplug-series-4.dtb
ipaddr=10.10.10.3
loadaddr=0x810000
loadfdt=echo loading ${fdtdir}/${fdtfile} ...; load ${devtype} ${bootpart} ${fdtaddr} ${fdtdir}/${fdtfile}

22
core/linux-kirkwood-dt/PKGBUILD
View file

@ -6,19 +6,19 @@ buildarch=2
pkgbase=linux-kirkwood-dt
_kernelname=${pkgbase#linux}
_desc="Marvell Kirkwood DT"
pkgver=4.4.1
pkgver=4.5.0
srcver=${pkgver%.0}
pkgrel=1
cryptodev_commit=bc67142c57eadc0aafd0323ec527849012786643
bfqver=v7r11
### BFQ patch kernel version
bfqkern=${pkgver:0:3}
# bfqkern=4.2
# bfqkern=${pkgver:0:3}
bfqkern=4.4
### AUFS branch name
aufsbranch="aufs${pkgver:0:3}"
# aufsbranch="aufs4.x-rcN"
# aufsbranch="aufs${pkgver:0:3}"
aufsbranch="aufs4.x-rcN"
arch=('arm')
url="http://www.kernel.org/"
@ -36,8 +36,8 @@ source=("https://kernel.org/pub/linux/kernel/v4.x/linux-${srcver}.tar.xz"
"ftp://teambelgium.net/bfq/patches/${bfqkern}.0-${bfqver}/0002-block-introduce-the-BFQ-${bfqver}-I-O-sched-for-${bfqkern}.0.patch"
"ftp://teambelgium.net/bfq/patches/${bfqkern}.0-${bfqver}/0003-block-bfq-add-Early-Queue-Merge-EQM-to-BFQ-${bfqver}-for.patch"
'goflexhome_fdt.patch'
'pogoplugv4_fdt.patch'
'nsa325_fdt.patch'
# 'pogoplugv4_fdt.patch'
# 'nsa325_fdt.patch'
'linux.preset')
md5sums=('d27b1458acde6369cf9eaf956f402901'
@ -50,7 +50,7 @@ md5sums=('d27b1458acde6369cf9eaf956f402901'
'953133d5e387de2ad79ac0ae5c27cb6b'
'f0387e673975e9f2a5e05136948edece'
'ce1975f40c48ec1b08dd09447ab043ca'
'7efecf23dbebc1ee2e2ccb527c8579c0'
# '7efecf23dbebc1ee2e2ccb527c8579c0'
'8ac6e9bb64a482925a5192e4d1d570f8'
'959e49540dac4c5e689ad9037150a360')
@ -74,8 +74,8 @@ prepare() {
msg2 "Add Arch Linux ARM patch for ARMv5te plug computers"
patch -Np1 -i "${srcdir}/archlinuxarm.patch"
patch -Np1 -i "${srcdir}/goflexhome_fdt.patch"
patch -Np1 -i "${srcdir}/pogoplugv4_fdt.patch"
patch -Np1 -i "${srcdir}/nsa325_fdt.patch"
# patch -Np1 -i "${srcdir}/pogoplugv4_fdt.patch"
# patch -Np1 -i "${srcdir}/nsa325_fdt.patch"
msg2 "Add BFQ patches"
patch -Np1 -i "${srcdir}/0001-block-cgroups-kconfig-build-bits-for-BFQ-${bfqver}-${bfqkern}.0.patch"
@ -217,8 +217,6 @@ _package-headers() {
# copy arch includes for external modules
mkdir -p ${pkgdir}/usr/src/linux-${_kernver}/arch/$KARCH
cp -a arch/$KARCH/include ${pkgdir}/usr/src/linux-${_kernver}/arch/$KARCH/
mkdir -p ${pkgdir}/usr/src/linux-${_kernver}/arch/$KARCH/mach-mvebu
cp -a arch/$KARCH/mach-mvebu/include ${pkgdir}/usr/src/linux-${_kernver}/arch/$KARCH/mach-mvebu/
mkdir -p ${pkgdir}/usr/src/linux-${_kernver}/arch/$KARCH/plat-orion
cp -a arch/$KARCH/plat-orion/include ${pkgdir}/usr/src/linux-${_kernver}/arch/$KARCH/plat-orion/

154
core/linux-kirkwood-dt/archlinuxarm.patch
View file

@ -1,6 +1,43 @@
diff -ruN a/arch/arm/boot/dts/kirkwood-nsa320.dts b/arch/arm/boot/dts/kirkwood-nsa320.dts
--- a/arch/arm/boot/dts/kirkwood-nsa320.dts 2016-03-13 22:28:54.000000000 -0600
+++ b/arch/arm/boot/dts/kirkwood-nsa320.dts 2016-03-15 20:36:16.470111122 -0600
@@ -193,10 +193,19 @@
};
};
+ nsa3xx-hwmon {
+ compatible = "zyxel,nsa320-mcu";
+ pinctrl-0 = <&pmx_mcu_data &pmx_mcu_clk &pmx_mcu_act>;
+ pinctrl-names = "default";
+
+ data-gpios = <&gpio0 14 GPIO_ACTIVE_HIGH>;
+ clk-gpios = <&gpio0 16 GPIO_ACTIVE_HIGH>;
+ act-gpios = <&gpio0 17 GPIO_ACTIVE_HIGH>;
+ };
+
/* The following pins are currently not assigned to a driver,
some of them should be configured as inputs.
- pinctrl-0 = <&pmx_mcu_data &pmx_mcu_clk &pmx_mcu_act
- &pmx_htp &pmx_vid_b1
+ pinctrl-0 = <&pmx_htp &pmx_vid_b1
&pmx_power_resume_data &pmx_power_resume_clk>; */
};
diff -ruN a/arch/arm/boot/dts/kirkwood-pogo_e02.dts b/arch/arm/boot/dts/kirkwood-pogo_e02.dts
--- a/arch/arm/boot/dts/kirkwood-pogo_e02.dts 2016-03-13 22:28:54.000000000 -0600
+++ b/arch/arm/boot/dts/kirkwood-pogo_e02.dts 2016-03-15 20:36:16.475111102 -0600
@@ -38,7 +38,7 @@
health {
label = "pogo_e02:green:health";
gpios = <&gpio1 16 GPIO_ACTIVE_LOW>;
- default-state = "keep";
+ default-state = "default-on";
};
fault {
label = "pogo_e02:orange:fault";
diff -ruN a/drivers/ata/sata_mv.c b/drivers/ata/sata_mv.c
--- a/drivers/ata/sata_mv.c 2015-04-12 22:12:50.000000000 +0000
+++ b/drivers/ata/sata_mv.c 2015-04-15 09:52:27.331715305 +0000
--- a/drivers/ata/sata_mv.c 2016-03-13 22:28:54.000000000 -0600
+++ b/drivers/ata/sata_mv.c 2016-03-15 20:36:16.415111342 -0600
@@ -72,6 +72,7 @@
#include <scsi/scsi_cmnd.h>
#include <scsi/scsi_device.h>
@ -9,7 +46,7 @@ diff -ruN a/drivers/ata/sata_mv.c b/drivers/ata/sata_mv.c
#define DRV_NAME "sata_mv"
#define DRV_VERSION "1.28"
@@ -1170,6 +1171,8 @@
@@ -1175,6 +1176,8 @@
{
int want_ncq = (protocol == ATA_PROT_NCQ);
@ -19,9 +56,9 @@ diff -ruN a/drivers/ata/sata_mv.c b/drivers/ata/sata_mv.c
int using_ncq = ((pp->pp_flags & MV_PP_FLAG_NCQ_EN) != 0);
if (want_ncq != using_ncq)
diff -ruN a/drivers/hwmon/Kconfig b/drivers/hwmon/Kconfig
--- a/drivers/hwmon/Kconfig 2015-04-12 22:12:50.000000000 +0000
+++ b/drivers/hwmon/Kconfig 2015-04-15 09:52:27.354716880 +0000
@@ -1703,6 +1703,19 @@
--- a/drivers/hwmon/Kconfig 2016-03-13 22:28:54.000000000 -0600
+++ b/drivers/hwmon/Kconfig 2016-03-15 20:36:16.435111262 -0600
@@ -1747,6 +1747,19 @@
This driver provides support for the Ultra45 workstation environmental
sensors.
@ -42,19 +79,19 @@ diff -ruN a/drivers/hwmon/Kconfig b/drivers/hwmon/Kconfig
comment "ACPI drivers"
diff -ruN a/drivers/hwmon/Makefile b/drivers/hwmon/Makefile
--- a/drivers/hwmon/Makefile 2015-04-12 22:12:50.000000000 +0000
+++ b/drivers/hwmon/Makefile 2015-04-15 09:52:27.356717022 +0000
@@ -115,6 +115,7 @@
obj-$(CONFIG_SENSORS_MAX6650) += max6650.o
--- a/drivers/hwmon/Makefile 2016-03-13 22:28:54.000000000 -0600
+++ b/drivers/hwmon/Makefile 2016-03-15 20:36:16.435111262 -0600
@@ -117,6 +117,7 @@
obj-$(CONFIG_SENSORS_MAX6697) += max6697.o
obj-$(CONFIG_SENSORS_MAX31790) += max31790.o
obj-$(CONFIG_SENSORS_MC13783_ADC)+= mc13783-adc.o
+obj-$(CONFIG_SENSORS_NSA3XX) += nsa3xx-hwmon.o
obj-$(CONFIG_SENSORS_MCP3021) += mcp3021.o
obj-$(CONFIG_SENSORS_MENF21BMC_HWMON) += menf21bmc_hwmon.o
obj-$(CONFIG_SENSORS_NCT6683) += nct6683.o
diff -ruN a/drivers/hwmon/nsa3xx-hwmon.c b/drivers/hwmon/nsa3xx-hwmon.c
--- a/drivers/hwmon/nsa3xx-hwmon.c 1970-01-01 00:00:00.000000000 +0000
+++ b/drivers/hwmon/nsa3xx-hwmon.c 2015-04-15 09:52:27.359717235 +0000
--- a/drivers/hwmon/nsa3xx-hwmon.c 1969-12-31 17:00:00.000000000 -0700
+++ b/drivers/hwmon/nsa3xx-hwmon.c 2016-03-15 20:36:16.435111262 -0600
@@ -0,0 +1,251 @@
+/*
+ * drivers/hwmon/nsa3xx-hwmon.c
@ -308,8 +345,8 @@ diff -ruN a/drivers/hwmon/nsa3xx-hwmon.c b/drivers/hwmon/nsa3xx-hwmon.c
+MODULE_LICENSE("GPL");
+MODULE_ALIAS("platform:nsa3xx-hwmon");
diff -ruN a/drivers/leds/trigger/Kconfig b/drivers/leds/trigger/Kconfig
--- a/drivers/leds/trigger/Kconfig 2015-04-12 22:12:50.000000000 +0000
+++ b/drivers/leds/trigger/Kconfig 2015-04-15 09:52:27.333715417 +0000
--- a/drivers/leds/trigger/Kconfig 2016-03-13 22:28:54.000000000 -0600
+++ b/drivers/leds/trigger/Kconfig 2016-03-15 20:36:16.445111222 -0600
@@ -35,7 +35,6 @@
config LEDS_TRIGGER_IDE_DISK
@ -319,9 +356,9 @@ diff -ruN a/drivers/leds/trigger/Kconfig b/drivers/leds/trigger/Kconfig
help
This allows LEDs to be controlled by IDE disk activity.
diff -ruN a/drivers/leds/trigger/ledtrig-ide-disk.c b/drivers/leds/trigger/ledtrig-ide-disk.c
--- a/drivers/leds/trigger/ledtrig-ide-disk.c 2015-04-12 22:12:50.000000000 +0000
+++ b/drivers/leds/trigger/ledtrig-ide-disk.c 2015-04-15 09:52:27.335715542 +0000
@@ -18,25 +18,36 @@
--- a/drivers/leds/trigger/ledtrig-ide-disk.c 2016-03-13 22:28:54.000000000 -0600
+++ b/drivers/leds/trigger/ledtrig-ide-disk.c 2016-03-15 20:45:22.852900230 -0600
@@ -17,19 +17,29 @@
#define BLINK_DELAY 30
@ -337,9 +374,9 @@ diff -ruN a/drivers/leds/trigger/ledtrig-ide-disk.c b/drivers/leds/trigger/ledtr
- &ide_blink_delay, &ide_blink_delay, 0);
+ switch (port_number) {
+ case 0:
+ led_trigger_blink_oneshot(ledtrig_ide1, &ide_blink_delay, &ide_blink_delay, 0);
+ led_trigger_blink_oneshot(ledtrig_ide1, &ide_blink_delay, &ide_blink_delay, 0);
+ break;
+ case 1:
+ case 1:
+ led_trigger_blink_oneshot(ledtrig_ide2, &ide_blink_delay, &ide_blink_delay, 0);
+ break;
+ default:
@ -351,23 +388,15 @@ diff -ruN a/drivers/leds/trigger/ledtrig-ide-disk.c b/drivers/leds/trigger/ledtr
static int __init ledtrig_ide_init(void)
{
- led_trigger_register_simple("ide-disk", &ledtrig_ide);
+ led_trigger_register_simple("ide-disk1", &ledtrig_ide1);
+ led_trigger_register_simple("ide-disk1", &ledtrig_ide1);
+ led_trigger_register_simple("ide-disk2", &ledtrig_ide2);
return 0;
}
static void __exit ledtrig_ide_exit(void)
{
- led_trigger_unregister_simple(ledtrig_ide);
+ led_trigger_unregister_simple(ledtrig_ide1);
+ led_trigger_unregister_simple(ledtrig_ide2);
}
module_init(ledtrig_ide_init);
device_initcall(ledtrig_ide_init);
diff -ruN a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c
--- a/drivers/mmc/core/core.c 2015-04-12 22:12:50.000000000 +0000
+++ b/drivers/mmc/core/core.c 2015-04-15 09:52:27.344716175 +0000
@@ -811,7 +811,7 @@
--- a/drivers/mmc/core/core.c 2016-03-13 22:28:54.000000000 -0600
+++ b/drivers/mmc/core/core.c 2016-03-15 20:36:16.450111202 -0600
@@ -850,7 +850,7 @@
*/
limit_us = 3000000;
else
@ -377,9 +406,9 @@ diff -ruN a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c
/*
* SDHC cards always use these fixed values.
diff -ruN a/drivers/mmc/core/sd.c b/drivers/mmc/core/sd.c
--- a/drivers/mmc/core/sd.c 2015-04-12 22:12:50.000000000 +0000
+++ b/drivers/mmc/core/sd.c 2015-04-15 09:52:27.347716383 +0000
@@ -366,6 +366,15 @@
--- a/drivers/mmc/core/sd.c 2016-03-13 22:28:54.000000000 -0600
+++ b/drivers/mmc/core/sd.c 2016-03-15 20:36:16.450111202 -0600
@@ -365,6 +365,15 @@
return -ENOMEM;
}
@ -396,9 +425,9 @@ diff -ruN a/drivers/mmc/core/sd.c b/drivers/mmc/core/sd.c
if (err)
goto out;
diff -ruN a/drivers/mmc/host/mvsdio.c b/drivers/mmc/host/mvsdio.c
--- a/drivers/mmc/host/mvsdio.c 2015-04-12 22:12:50.000000000 +0000
+++ b/drivers/mmc/host/mvsdio.c 2015-04-15 09:53:11.289831429 +0000
@@ -25,6 +25,7 @@
--- a/drivers/mmc/host/mvsdio.c 2016-03-13 22:28:54.000000000 -0600
+++ b/drivers/mmc/host/mvsdio.c 2016-03-15 20:36:16.455111182 -0600
@@ -23,6 +23,7 @@
#include <linux/of_irq.h>
#include <linux/mmc/host.h>
#include <linux/mmc/slot-gpio.h>
@ -406,7 +435,7 @@ diff -ruN a/drivers/mmc/host/mvsdio.c b/drivers/mmc/host/mvsdio.c
#include <asm/sizes.h>
#include <asm/unaligned.h>
@@ -152,6 +153,7 @@
@@ -149,6 +150,7 @@
dev_dbg(host->dev, "cmd %d (hw state 0x%04x)\n",
cmd->opcode, mvsd_read(MVSD_HW_STATE));
@ -415,9 +444,9 @@ diff -ruN a/drivers/mmc/host/mvsdio.c b/drivers/mmc/host/mvsdio.c
cmdreg = MVSD_CMD_INDEX(cmd->opcode);
diff -ruN a/include/linux/leds.h b/include/linux/leds.h
--- a/include/linux/leds.h 2015-04-12 22:12:50.000000000 +0000
+++ b/include/linux/leds.h 2015-04-15 09:52:27.337715670 +0000
@@ -268,9 +268,9 @@
--- a/include/linux/leds.h 2016-03-13 22:28:54.000000000 -0600
+++ b/include/linux/leds.h 2016-03-15 20:36:16.455111182 -0600
@@ -320,9 +320,9 @@
/* Trigger specific functions */
#ifdef CONFIG_LEDS_TRIGGER_IDE_DISK
@ -430,8 +459,8 @@ diff -ruN a/include/linux/leds.h b/include/linux/leds.h
#if defined(CONFIG_LEDS_TRIGGER_CAMERA) || defined(CONFIG_LEDS_TRIGGER_CAMERA_MODULE)
diff -ruN a/include/linux/nsa3xx-hwmon.h b/include/linux/nsa3xx-hwmon.h
--- a/include/linux/nsa3xx-hwmon.h 1970-01-01 00:00:00.000000000 +0000
+++ b/include/linux/nsa3xx-hwmon.h 2015-04-15 09:52:27.360717306 +0000
--- a/include/linux/nsa3xx-hwmon.h 1969-12-31 17:00:00.000000000 -0700
+++ b/include/linux/nsa3xx-hwmon.h 2016-03-15 20:36:16.455111182 -0600
@@ -0,0 +1,21 @@
+/*
+ * include/linux/nsa3xx.hwmon.h
@ -454,40 +483,3 @@ diff -ruN a/include/linux/nsa3xx-hwmon.h b/include/linux/nsa3xx-hwmon.h
+};
+
+#endif /* __LINUX_NSA3XX_HWMON_H */
diff -Naur a/arch/arm/boot/dts/kirkwood-nsa320.dts b/arch/arm/boot/dts/kirkwood-nsa320.dts
--- a/arch/arm/boot/dts/kirkwood-nsa320.dts 2015-08-30 11:34:09.000000000 -0700
+++ b/arch/arm/boot/dts/kirkwood-nsa320.dts 2015-08-31 00:50:12.000000000 -0700
@@ -193,10 +193,19 @@
};
};
+ nsa3xx-hwmon {
+ compatible = "zyxel,nsa320-mcu";
+ pinctrl-0 = <&pmx_mcu_data &pmx_mcu_clk &pmx_mcu_act>;
+ pinctrl-names = "default";
+
+ data-gpios = <&gpio0 14 GPIO_ACTIVE_HIGH>;
+ clk-gpios = <&gpio0 16 GPIO_ACTIVE_HIGH>;
+ act-gpios = <&gpio0 17 GPIO_ACTIVE_HIGH>;
+ };
+
/* The following pins are currently not assigned to a driver,
some of them should be configured as inputs.
- pinctrl-0 = <&pmx_mcu_data &pmx_mcu_clk &pmx_mcu_act
- &pmx_htp &pmx_vid_b1
+ pinctrl-0 = <&pmx_htp &pmx_vid_b1
&pmx_power_resume_data &pmx_power_resume_clk>; */
};
diff -ruN a/arch/arm/boot/dts/kirkwood-pogo_e02.dts b/arch/arm/boot/dts/kirkwood-pogo_e02.dts
--- a/arch/arm/boot/dts/kirkwood-pogo_e02.dts 2015-08-30 18:34:09.000000000 +0000
+++ b/arch/arm/boot/dts/kirkwood-pogo_e02.dts 2015-09-07 08:17:05.277878971 +0000
@@ -38,7 +38,7 @@
health {
label = "pogo_e02:green:health";
gpios = <&gpio1 16 GPIO_ACTIVE_LOW>;
- default-state = "keep";
+ default-state = "default-on";
};
fault {
label = "pogo_e02:orange:fault";

2
core/linux-kirkwood-dt/linux-kirkwood-dt.install
View file

@ -2,7 +2,7 @@
# arg 2: the old package version
KERNEL_NAME=-kirkwood-dt
KERNEL_VERSION=4.4.1-1-ARCH
KERNEL_VERSION=4.5.0-1-ARCH
post_install () {
# updating module dependencies