From 53c6166f6c863dc1ccb43dd1cdaa4756243af323 Mon Sep 17 00:00:00 2001 From: vojo Date: Fri, 13 Oct 2017 14:46:36 +0200 Subject: Updated U-boot repository URL and minor additions diff --git a/conf/machine/simc-t2081-tcb-02.conf b/conf/machine/simc-t2081-tcb-02.conf index 4568955..d05e820 100755 --- a/conf/machine/simc-t2081-tcb-02.conf +++ b/conf/machine/simc-t2081-tcb-02.conf @@ -16,8 +16,7 @@ KERNEL_FIT_IMAGES ?= "simc-t2081" PREFERRED_PROVIDER_virtual/bootloader = "${PREFERRED_PROVIDER_u-boot}" PREFERRED_VERSION_u-boot_qoriq = "2017.09" UBOOT_CONFIG ??= "nand" -#UBOOT_CONFIG[nand] = "T2_simc-t2081_nand_config,,u-boot-with-spl-pbl.bin" -UBOOT_CONFIG[nand] = "T1_simc-t10xx_nand_config,,u-boot-with-spl-pbl.bin" +UBOOT_CONFIG[nand] = "T2_simc-t2081_nand_config,,u-boot-with-spl-pbl.bin" # Images types generated for this machine IMAGE_FSTYPES = "tar.bz2 ubifs ubi" diff --git a/recipes-benchmark/stress-ng/stress-ng_0.08.15.bb b/recipes-benchmark/stress-ng/stress-ng_0.08.15.bb new file mode 100644 index 0000000..7397b2a --- /dev/null +++ b/recipes-benchmark/stress-ng/stress-ng_0.08.15.bb @@ -0,0 +1,26 @@ +DESCRIPTION = "stress-ng will stress test a computer system in various selectable ways. \ + It was designed to exercise various physical subsystems of a computer as well as the \ + various operating system kernel interfaces." +HOMEPAGE = "http://kernel.ubuntu.com/~cking/stress-ng/" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" + +SRC_URI = "git://kernel.ubuntu.com/cking/stress-ng.git;protocol=git" +SRCREV = "e59ea5d3c246361880f096d25ac6361dd4590f81" + +S = "${WORKDIR}/git" + +EXTRA_OEMAKE = "\ + 'CC=${CC}' \ + 'CFLAGS=${CFLAGS}' \ + 'LFLAGS=${LDFLAGS} -lrt' \ +" + +do_compile() { + oe_runmake CFLAGS="-DVERSION=\\\"${PV}\\\"" +} + +do_install() { + oe_runmake install DESTDIR=${D} BINDIR=${bindir} MANDIR=${mandir} + chown -R root:root ${D} ${bindir} ${mandir} +} \ No newline at end of file diff --git a/recipes-bsp/u-boot/u-boot-qoriq_2017.09.bb b/recipes-bsp/u-boot/u-boot-qoriq_2017.09.bb index 7adc169..b96515b 100755 --- a/recipes-bsp/u-boot/u-boot-qoriq_2017.09.bb +++ b/recipes-bsp/u-boot/u-boot-qoriq_2017.09.bb @@ -1,4 +1,4 @@ require recipes-bsp/u-boot/u-boot-qoriq_2016.09.bb -SRC_URI = "git://source.sintecs.nl/scalys/u-boot-fsl-qoriq;protocol=http;branch=scalys" -SRCREV = "0d48297646c426cdd206b0e530495ab7eb02acd3" \ No newline at end of file +SRC_URI = "git://git.scalys.com/u-boot-fsl-qoriq;branch=scalys" +SRCREV = "c9b89a4f8b11463e3bd8587a05ae0955e2e86c2a" \ No newline at end of file diff --git a/recipes-kernel/linux/files/defconfig_append_simc-t10xx b/recipes-kernel/linux/files/defconfig_append_simc-t10xx index 5bcf08c..0b4f343 100755 --- a/recipes-kernel/linux/files/defconfig_append_simc-t10xx +++ b/recipes-kernel/linux/files/defconfig_append_simc-t10xx @@ -49,6 +49,7 @@ CONFIG_PMBUS=y CONFIG_SENSORS_PMBUS=y CONFIG_SENSORS_UCD9200=y CONFIG_SENSORS_INA2XX=y +CONFIG_SENSORS_EMC2103=y CONFIG_THERMAL=y CONFIG_THERMAL_HWMON=y CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y @@ -100,6 +101,10 @@ CONFIG_DEFAULT_MESSAGE_LOGLEVEL=4 CONFIG_DEBUG_INFO=y CONFIG_CRYPTO_ARC4=y CONFIG_CRYPTO_DEV_FSL_CAAM_JR_UIO=y + +CONFIG_FAT_DEFAULT_CODEPAGE=437 +CONFIG_NLS_CODEPAGE_437=y + # # end of simc-t10xx configs # (make sure to end with a new line due to an additional freescale script) diff --git a/recipes-kernel/linux/files/defconfig_append_simc-t2081 b/recipes-kernel/linux/files/defconfig_append_simc-t2081 index 9e04f23..c303143 100755 --- a/recipes-kernel/linux/files/defconfig_append_simc-t2081 +++ b/recipes-kernel/linux/files/defconfig_append_simc-t2081 @@ -54,6 +54,8 @@ CONFIG_PMBUS=y CONFIG_SENSORS_PMBUS=y CONFIG_SENSORS_UCD9200=y CONFIG_SENSORS_INA2XX=y +CONFIG_SENSORS_EMC2103=y + #CONFIG_FSL_BMAN_TEST=y #CONFIG_FSL_BMAN_TEST_HIGH=y @@ -64,6 +66,9 @@ CONFIG_SENSORS_INA2XX=y CONFIG_LEGACY_PTYS=y +CONFIG_FAT_DEFAULT_CODEPAGE=437 +CONFIG_NLS_CODEPAGE_437=y + # # end of simc-t2081 configs # (make sure to end with a new line due to an additional freescale script) diff --git a/recipes-kernel/linux/files/simc-t10xx_device_tree_addition.patch b/recipes-kernel/linux/files/simc-t10xx_device_tree_addition.patch index eebd9a6..eaf47c9 100755 --- a/recipes-kernel/linux/files/simc-t10xx_device_tree_addition.patch +++ b/recipes-kernel/linux/files/simc-t10xx_device_tree_addition.patch @@ -6,10 +6,10 @@ Subject: [PATCH] simc-t10xx_device_tree_patch --- arch/powerpc/boot/dts/fsl/qoriq-i2c-0.dtsi | 4 +- arch/powerpc/boot/dts/fsl/qoriq-i2c-1.dtsi | 4 +- - arch/powerpc/boot/dts/fsl/simc-t1022.dts | 304 ++++++++++++++++++++++++++++ - arch/powerpc/boot/dts/fsl/simc-t1040.dts | 311 +++++++++++++++++++++++++++++ + arch/powerpc/boot/dts/fsl/simc-t1022.dts | 307 ++++++++++++++++++++++++++++ + arch/powerpc/boot/dts/fsl/simc-t1040.dts | 321 +++++++++++++++++++++++++++++ arch/powerpc/boot/dts/fsl/simc-t10xx.dtsi | 162 +++++++++++++++ - 5 files changed, 781 insertions(+), 4 deletions(-) + 5 files changed, 797 insertions(+), 4 deletions(-) create mode 100644 arch/powerpc/boot/dts/fsl/simc-t1022.dts create mode 100644 arch/powerpc/boot/dts/fsl/simc-t1040.dts create mode 100644 arch/powerpc/boot/dts/fsl/simc-t10xx.dtsi @@ -63,11 +63,11 @@ new file mode 100644 index 0000000..3fc75f0 --- /dev/null +++ b/arch/powerpc/boot/dts/fsl/simc-t1022.dts -@@ -0,0 +1,304 @@ +@@ -0,0 +1,307 @@ +/* + * Device tree for the SiMC-T1022 Module + * -+ * Copyright 2016 Scalys B.V. ++ * Copyright 2017 Scalys B.V. + * + * This software is licensed under the terms of the GNU General Public + * License version 2, as published by the Free Software Foundation, and @@ -120,14 +120,12 @@ index 0000000..3fc75f0 + sleep = <&rcpm 0x00000008>; + + enet0: ethernet@e0000 { -+ /*phy-handle = <&sgmii_aqr105_phy_s5>;*/ + phy-connection-type = "sgmii"; + fixed-link = <1 1 1000 0 0>; + sleep = <&rcpm 0x80000000>; + }; + + enet1: ethernet@e2000 { -+ /*phy-handle = <&sgmii_aqr105_phy_s4>;*/ + phy-connection-type = "sgmii"; + fixed-link = <2 1 1000 0 0>; + sleep = <&rcpm 0x40000000>; @@ -261,6 +259,11 @@ index 0000000..3fc75f0 + compatible = "ti,ucd9224"; + reg = <0x4e>; + }; ++ ++ emc2103: thermal@2d { ++ compatible = "microchip,emc2103"; ++ reg = <0x2d>; ++ }; + + eeprom_module@50 { + compatible = "microchip,24c1024"; @@ -373,11 +376,11 @@ new file mode 100644 index 0000000..d3fc108 --- /dev/null +++ b/arch/powerpc/boot/dts/fsl/simc-t1040.dts -@@ -0,0 +1,311 @@ +@@ -0,0 +1,321 @@ +/* + * Device tree for the SiMC-T1040 Module + * -+ * Copyright 2016 Scalys B.V. ++ * Copyright 2017 Scalys B.V. + * + * This software is licensed under the terms of the GNU General Public + * License version 2, as published by the Free Software Foundation, and @@ -427,35 +430,37 @@ index 0000000..d3fc108 + }; + + fman0: fman@400000 { -+ sleep = <&rcpm 0x00000008>; ++ rcpm-wakeup = <&rcpm 0x00000008>; + + enet0: ethernet@e0000 { -+ status = "disabled"; ++ phy-connection-type = "sgmii"; ++ fixed-link = <1 1 1000 0 0>; ++ rcpm-wakeup = <&rcpm 0x80000000>; + }; + + enet1: ethernet@e2000 { + phy-connection-type = "sgmii"; + fixed-link = <2 1 1000 0 0>; -+ sleep = <&rcpm 0x40000000>; ++ rcpm-wakeup = <&rcpm 0x40000000>; + }; + + enet2: ethernet@e4000 { + phy-connection-type = "sgmii"; + fixed-link = <3 1 1000 0 0>; -+ sleep = <&rcpm 0x20000000>; ++ rcpm-wakeup = <&rcpm 0x20000000>; + }; + + enet3: ethernet@e6000 { + phy-handle = <&phy_rgmii_0>; + phy-connection-type = "rgmii"; -+ sleep = <&rcpm 0x10000000>; ++ rcpm-wakeup = <&rcpm 0x10000000>; + local-mac-address = [ ca fe ba be 00 01 ]; + }; + + enet4: ethernet@e8000 { + phy-handle = <&phy_rgmii_1>; + phy-connection-type = "rgmii"; -+ sleep = <&rcpm 0x08000000>; ++ rcpm-wakeup = <&rcpm 0x08000000>; + local-mac-address = [ ca fe ba be 00 02 ]; + }; + @@ -502,7 +507,10 @@ index 0000000..d3fc108 + + fsl,dpaa { + compatible = "fsl,t1040-dpaa", "fsl,dpaa"; -+ ++ ethernet@0 { ++ compatible = "fsl,t1040-dpa-ethernet", "fsl,dpa-ethernet"; ++ fsl,fman-mac = <&enet0>; ++ }; + ethernet@1 { + compatible = "fsl,t1040-dpa-ethernet", "fsl,dpa-ethernet"; + fsl,fman-mac = <&enet1>; @@ -590,6 +598,11 @@ index 0000000..d3fc108 + compatible = "ti,ucd9224"; + reg = <0x4e>; + }; ++ ++ emc2103: thermal@2d { ++ compatible = "microchip,emc2103"; ++ reg = <0x2d>; ++ }; + + eeprom_module@50 { + compatible = "microchip,24c1024"; @@ -694,7 +707,7 @@ index 0000000..562cfc1 +/* + * Device tree for the SiMC-T10xx series Modules + * -+ * Copyright 2016 Scalys B.V. ++ * Copyright 2017 Scalys B.V. + * + * This software is licensed under the terms of the GNU General Public + * License version 2, as published by the Free Software Foundation, and diff --git a/recipes-kernel/linux/files/simc-t2081_device_tree_addition.patch b/recipes-kernel/linux/files/simc-t2081_device_tree_addition.patch index a5382b1..eb39ea8 100755 --- a/recipes-kernel/linux/files/simc-t2081_device_tree_addition.patch +++ b/recipes-kernel/linux/files/simc-t2081_device_tree_addition.patch @@ -4,9 +4,9 @@ Date: Fri, 25 Aug 2017 09:37:45 +0200 Subject: [PATCH] simc-t2081_device_tree_addition --- - arch/powerpc/boot/dts/fsl/simc-t2081.dts | 207 ++++++++++++++++++++++++++++++ + arch/powerpc/boot/dts/fsl/simc-t2081.dts | 212 ++++++++++++++++++++++++++++++ arch/powerpc/boot/dts/fsl/simc-t2081.dtsi | 197 +++++++++++++++ - 2 files changed, 404 insertions(+) + 2 files changed, 409 insertions(+) create mode 100644 arch/powerpc/boot/dts/fsl/simc-t2081.dts create mode 100644 arch/powerpc/boot/dts/fsl/simc-t2081.dtsi @@ -15,7 +15,7 @@ new file mode 100644 index 0000000..193170e --- /dev/null +++ b/arch/powerpc/boot/dts/fsl/simc-t2081.dts -@@ -0,0 +1,207 @@ +@@ -0,0 +1,212 @@ +/* + * Device tree for the SiMC-T2081 Module + * @@ -129,6 +129,11 @@ index 0000000..193170e + compatible = "ti,ucd9224"; + reg = <0x4e>; + }; ++ ++ emc2103: thermal@2d { ++ compatible = "microchip,emc2103"; ++ reg = <0x2d>; ++ }; + + eeprom_module@50 { + compatible = "microchip,24c1024"; @@ -352,7 +357,7 @@ index 0000000..62cc360 + pcie@0 { + ranges = <0x02000000 0 0xe0000000 + 0x02000000 0 0xe0000000 -+ 0 0x20000000 ++ 0 0x10000000 + + 0x01000000 0 0x00000000 + 0x01000000 0 0x00000000 @@ -361,13 +366,13 @@ index 0000000..62cc360 + }; + + pci2: pcie@ffe260000 { -+ reg = <0xf 0xfe260000 0 0x1000>; ++ reg = <0xf 0xfe260000 0 0x10000>; + ranges = <0x02000000 0 0xe0000000 0xc 0x30000000 0 0x10000000 + 0x01000000 0 0x00000000 0xf 0xf8020000 0 0x00010000>; + pcie@0 { + ranges = <0x02000000 0 0xe0000000 + 0x02000000 0 0xe0000000 -+ 0 0x20000000 ++ 0 0x10000000 + + 0x01000000 0 0x00000000 + 0x01000000 0 0x00000000 @@ -382,7 +387,7 @@ index 0000000..62cc360 + pcie@0 { + ranges = <0x02000000 0 0xe0000000 + 0x02000000 0 0xe0000000 -+ 0 0x20000000 ++ 0 0x10000000 + + 0x01000000 0 0x00000000 + 0x01000000 0 0x00000000 -- cgit v0.10.2