added support for qt1040-1gb target

8 files changed, 156 insertions, 21 deletions

diff --git a/conf/layer.conf b/conf/layer.conf
index 65d2d03..5e51e37 100644
--- a/conf/layer.conf
+++ b/conf/layer.conf
@@ -8,3 +8,6 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \
 BBFILE_COLLECTIONS += "scalys-ppc"
 BBFILE_PATTERN_scalys-ppc := "^${LAYERDIR}/"
 BBFILE_PRIORITY_scalys-ppc = "6"
+
+# whitelist restricted license
+LICENSE_FLAGS_WHITELIST = "non-commercial_netperf commercial_lame"
\ No newline at end of file
diff --git a/conf/machine/QT1040-1GB.conf b/conf/machine/qt1040-1gb.conf
index 71e82c5..4e71561 100644
--- a/conf/machine/QT1040-1GB.conf
+++ b/conf/machine/qt1040-1gb.conf
@@ -8,14 +8,15 @@ require conf/machine/include/e5500-64b.inc
 
 SOC_FAMILY = "t1:t1040"
 
-PREFERRED_PROVIDER_virtual/bootloader = "${PREFERRED_PROVIDER_u-boot}"
-UBOOT_CONFIG ??= "nand"
-UBOOT_CONFIG[nand] = "QT1040-1GB_nand_config"
-
-KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/simc-t10xx_defconfig"
+KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/corenet64_fmanv3l_smp_defconfig"
+KBUILD_DEFCONFIG ?= "corenet64_fmanv3l_smp_defconfig"
 KERNEL_DEVICETREE ?= "fsl/simc-t1040.dtb"
 KERNEL_FIT_IMAGES ?= "simc-t1040"
 
+PREFERRED_PROVIDER_virtual/bootloader = "${PREFERRED_PROVIDER_u-boot}"
+UBOOT_CONFIG ??= "nand"
+UBOOT_CONFIG[nand] = "QT1040-1GB_nand_config,,u-boot-with-spl-pbl.bin"
+
 # Images types generated for this machine
 IMAGE_FSTYPES = "tar.bz2 ubifs ubi"
 
diff --git a/conf/machine/simc-t1022-tcb-02.conf b/conf/machine/simc-t1022-tcb-02.conf
index b83b436..bb4e523 100644
--- a/conf/machine/simc-t1022-tcb-02.conf
+++ b/conf/machine/simc-t1022-tcb-02.conf
@@ -8,13 +8,14 @@ require conf/machine/include/e5500-64b.inc
 
 SOC_FAMILY = "t1:t1022"
 
-KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/simc-t10xx_defconfig"
+KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/corenet64_fmanv3l_smp_defconfig"
+KBUILD_DEFCONFIG ?= "corenet64_fmanv3l_smp_defconfig"
 KERNEL_DEVICETREE ?= "fsl/simc-t1022.dtb"
 KERNEL_FIT_IMAGES ?= "simc-t1022"
 
 PREFERRED_PROVIDER_virtual/bootloader = "${PREFERRED_PROVIDER_u-boot}"
 UBOOT_CONFIG ??= "nand"
-UBOOT_CONFIG[nand] = "T1_simc-t10xx_nand_config"
+UBOOT_CONFIG[nand] = "T1_simc-t10xx_nand_config,,u-boot-with-spl-pbl.bin"
 
 # Images types generated for this machine
 IMAGE_FSTYPES = "tar.bz2 ubifs ubi"
diff --git a/conf/machine/simc-t1040-tcb-02.conf b/conf/machine/simc-t1040-tcb-02.conf
index 9db2969..9eef5d3 100644
--- a/conf/machine/simc-t1040-tcb-02.conf
+++ b/conf/machine/simc-t1040-tcb-02.conf
@@ -8,13 +8,14 @@ require conf/machine/include/e5500-64b.inc
 
 SOC_FAMILY = "t1:t1040"
 
-KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/simc-t10xx_defconfig"
+KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/corenet64_fmanv3l_smp_defconfig"
+KBUILD_DEFCONFIG ?= "corenet64_fmanv3l_smp_defconfig"
 KERNEL_DEVICETREE ?= "fsl/simc-t1040.dtb"
 KERNEL_FIT_IMAGES ?= "simc-t1040"
 
 PREFERRED_PROVIDER_virtual/bootloader = "${PREFERRED_PROVIDER_u-boot}"
 UBOOT_CONFIG ??= "nand"
-UBOOT_CONFIG[nand] = "T1_simc-t10xx_nand_config"
+UBOOT_CONFIG[nand] = "T1_simc-t10xx_nand_config,,u-boot-with-spl-pbl.bin"
 
 # Images types generated for this machine
 IMAGE_FSTYPES = "tar.bz2 ubifs ubi"
diff --git a/conf/machine/simc-t2081-tcb-02.conf b/conf/machine/simc-t2081-tcb-02.conf
index 152c4e5..a0ec686 100644
--- a/conf/machine/simc-t2081-tcb-02.conf
+++ b/conf/machine/simc-t2081-tcb-02.conf
@@ -8,13 +8,14 @@ require conf/machine/include/e6500-64b.inc
 
 SOC_FAMILY = "t2:t2081"
 
-KERNEL_DEFCONFIG ?= "TODO-t2081_defconfig"
-KERNEL_DEVICETREE ?= "TODO-t2081.dtb"
-KERNEL_FIT_IMAGES ?= "TODO-t2081"
+KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/corenet64_fmanv3h_smp_defconfig"
+KBUILD_DEFCONFIG ?= "corenet64_fmanv3h_smp_defconfig"
+KERNEL_DEVICETREE ?= "fsl/simc-t2081.dtb"
+KERNEL_FIT_IMAGES ?= "simc-t2081"
 
 PREFERRED_PROVIDER_virtual/bootloader = "${PREFERRED_PROVIDER_u-boot}"
 UBOOT_CONFIG ??= "nand"
-UBOOT_CONFIG[nand] = "T1_simc-t2081_nand_config"
+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-bsp/u-boot/u-boot-qoriq_2016.09.bbappend b/recipes-bsp/u-boot/u-boot-qoriq_2016.09.bbappend
index 07ae517..e87b3a2 100644
--- a/recipes-bsp/u-boot/u-boot-qoriq_2016.09.bbappend
+++ b/recipes-bsp/u-boot/u-boot-qoriq_2016.09.bbappend
@@ -1,2 +1,2 @@
 SRC_URI = "git://source.sintecs.nl/scalys/u-boot-fsl-qoriq;protocol=http;branch=scalys"
-SRCREV = "5d4f955da4df52fab89438bce8b3836d3450b9e5"
+SRCREV = "d8a6f5baf25ddfe0498c4347e8303f5669231f85"
\ No newline at end of file
diff --git a/recipes-kernel/linux/files/defconfig_append_t10xx b/recipes-kernel/linux/files/defconfig_append_t10xx
new file mode 100644
index 0000000..2409389
--- /dev/null
+++ b/recipes-kernel/linux/files/defconfig_append_t10xx
@@ -0,0 +1,127 @@
+#
+# simc-t10xx configs
+#
+CONFIG_FSL_ERRATUM_A_005337=y
+CONFIG_PPC_OF=y
+CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
+CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
+CONFIG_RELAY=y
+CONFIG_USE_GENERIC_SMP_HELPERS=y
+CONFIG_POWERNV_MSI=y
+CONFIG_CPU_FREQ_TABLE=y
+CONFIG_QORIQ_CPUFREQ=y
+CONFIG_CROSS_MEMORY_ATTACH=y
+CONFIG_COMPAT_NETLINK_MESSAGES=y
+CONFIG_WEXT_CORE=y
+CONFIG_WEXT_PROC=yl
+CONFIG_CFG80211=y
+CONFIG_CFG80211_DEFAULT_PS=y
+CONFIG_CFG80211_WEXT=y
+CONFIG_MAC80211=y
+CONFIG_MAC80211_HAS_RC=y
+CONFIG_MAC80211_RC_MINSTREL=y
+CONFIG_MAC80211_RC_MINSTREL_HT=y
+CONFIG_MAC80211_RC_DEFAULT_MINSTREL=y
+CONFIG_MAC80211_RC_DEFAULT="minstrel_ht"
+CONFIG_MAC80211_LEDS=y
+CONFIG_MAC80211_DEBUGFS=y
+CONFIG_FW_LOADER_USER_HELPER=y
+CONFIG_FTL=y
+CONFIG_MTD_SPI_NOR_BASE=y
+CONFIG_PROC_DEVICETREE=y
+CONFIG_FSL_USDPAA=y
+CONFIG_EEPROM_AT24=y
+CONFIG_SCSI_MULTI_LUN=y
+CONFIG_FSL_FMAN=y
+CONFIG_FSL_DPAA_ETH=y
+CONFIG_IGB=y
+CONFIG_IGB_HWMON=y
+CONFIG_MDIO_BUS_MUX_GPIO=y
+CONFIG_ATH_COMMON=y
+CONFIG_ATH_CARDS=y
+CONFIG_ATH9K_HW=y
+CONFIG_ATH9K_COMMON=y
+CONFIG_ATH9K_BTCOEX_SUPPORT=y
+CONFIG_ATH9K=y
+CONFIG_ATH9K_PCI=y
+CONFIG_ATH9K_AHB=y
+CONFIG_ATH9K_DEBUGFS=y
+CONFIG_ATH9K_LEGACY_RATE_CONTROL=y
+
+
+
+CONFIG_RTL_CARDS=y
+CONFIG_VT_HW_CONSOLE_BINDING=y
+CONFIG_DEVPORT=y
+CONFIG_I2C_ALGOBIT=y
+CONFIG_GPIOLIB=y
+CONFIG_HWMON=y
+CONFIG_HWMON_VID=y
+CONFIG_SENSORS_ADT7475=y
+CONFIG_SENSORS_LM90=y
+CONFIG_PMBUS=y
+CONFIG_SENSORS_PMBUS=y
+CONFIG_SENSORS_UCD9200=y
+CONFIG_SENSORS_INA2XX=y
+CONFIG_THERMAL=y
+CONFIG_THERMAL_HWMON=y
+CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y
+CONFIG_THERMAL_GOV_FAIR_SHARE=y
+CONFIG_THERMAL_GOV_STEP_WISE=y
+CONFIG_THERMAL_GOV_USER_SPACE=y
+CONFIG_CPU_THERMAL=y
+CONFIG_QORIQ_THERMAL=y
+CONFIG_SSB_POSSIBLE=y
+CONFIG_BCMA_POSSIBLE=y
+CONFIG_VIDEO_OUTPUT_CONTROL=y
+
+# Kernel won't boot with the following commented configs
+# CONFIG_FB_CFB_FILLRECT=y
+# CONFIG_FB_CFB_COPYAREA=y
+# CONFIG_FB_CFB_IMAGEBLIT=y
+# CONFIG_FB_MODE_HELPERS=y
+# CONFIG_FB_FSL_DIU=y
+
+CONFIG_FRAMEBUFFER_CONSOLE=y
+CONFIG_MMC_SDHCI_BIG_ENDIAN_32BIT_BYTE_SWAPPER=y
+CONFIG_NEW_LEDS=y
+CONFIG_LEDS_CLASS=y
+CONFIG_LEDS_TRIGGERS=y
+CONFIG_ASYNC_TX_ENABLE_CHANNEL_SWITCH=y
+CONFIG_FSL_RAID=y
+CONFIG_UIO_FSL_DMA=y
+CONFIG_NET_VENDOR_SILICOM=y
+CONFIG_FSL_DPA=y
+CONFIG_FSL_DPA_CHECKING=y
+CONFIG_FSL_BMAN_TEST=y
+CONFIG_FSL_BMAN_TEST_HIGH=y
+CONFIG_FSL_BMAN_TEST_THRESH=y
+CONFIG_FSL_QMAN_TEST=y
+CONFIG_FSL_QMAN_TEST_STASH_POTATO=y
+CONFIG_FSL_QMAN_TEST_HIGH=y
+CONFIG_FSL_PME2_PDSRSIZE=131072
+CONFIG_FSL_PME2_SRESIZE=327680
+CONFIG_FSL_RMAN_UIO=y
+CONFIG_FSL_SLEEP_FSM=y
+CONFIG_CLKDEV_LOOKUP=y
+CONFIG_HAVE_CLK_PREPARE=y
+CONFIG_COMMON_CLK=y
+CONFIG_CLK_QORIQ=y
+CONFIG_EXT4_FS=y
+CONFIG_JBD=y
+CONFIG_JBD2=y
+CONFIG_FS_MBCACHE=y
+CONFIG_HAS_IOPORT=y
+CONFIG_LIB_RHEAP=y
+CONFIG_AVERAGE=y
+CONFIG_FONT_SUPPORT=y
+CONFIG_FONTS=y
+CONFIG_FONT_8x16=y
+CONFIG_FONT_AUTOSELECT=y
+CONFIG_DEFAULT_MESSAGE_LOGLEVEL=4
+CONFIG_DEBUG_INFO=y
+CONFIG_CRYPTO_ARC4=y
+CONFIG_CRYPTO_DEV_FSL_CAAM_JR_UIO=y
+#
+# end of simc-t10xx configs
+# (make sure to end with a new line)
diff --git a/recipes-kernel/linux/linux-qoriq_4.1.bbappend b/recipes-kernel/linux/linux-qoriq_4.1.bbappend
index fb42674..102703e 100644
--- a/recipes-kernel/linux/linux-qoriq_4.1.bbappend
+++ b/recipes-kernel/linux/linux-qoriq_4.1.bbappend
@@ -1,11 +1,7 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
 
-SRCREV = "615c21a0bb56fc8af6e936dc7c2dd78d9eb52a60"
-SRC_URI = "\
-	git://source.sintecs.nl/scalys/linux-fsl-qoriq;protocol=http;branch=scalys \
-	file://fit_image_template.its \
-"
-
+SRCREV = "df40dca3df785ec7f1cc7eb04812ab207499d65e"
+SRC_URI = "git://source.sintecs.nl/scalys/linux-fsl-qoriq;protocol=http;branch=scalys file://fit_image_template.its"
 
 python __anonymous () {
     d.appendVar("PACKAGES", " kernel-fitimage")
@@ -13,6 +9,11 @@ python __anonymous () {
 
 FILES_kernel-fitimage = "/boot/"
 
+# Appending of simc-t10xx specific kernel configs to the used defconfig.
+do_configure_prepend() {
+         cat ${THISDIR}/../../../meta-scalys-ppc/recipes-kernel/linux/files/defconfig_append_t10xx >> ${KERNEL_DEFCONFIG}
+}
+
 do_kernel_fitimage() {
 	cd ${B}
 	for i in ${KERNEL_FIT_IMAGES}; do
@@ -44,4 +45,4 @@ do_kernel_fitimage() {
 }
 
 # The install stage generates the DTB needed for the FIT image (linux-dtb.inc)
-addtask do_kernel_fitimage after do_install before do_deploy
+addtask do_kernel_fitimage after do_install before do_package