diff --git a/bootloader/u-boot_2015_04/include/configs/mx6s_prime_oven.h b/bootloader/u-boot_2015_04/include/configs/mx6s_prime_oven.h index 96fad82..79c021a 100755 --- a/bootloader/u-boot_2015_04/include/configs/mx6s_prime_oven.h +++ b/bootloader/u-boot_2015_04/include/configs/mx6s_prime_oven.h @@ -183,9 +183,9 @@ "loadaddr=0x12000000\0" \ "boot_fdt=try\0" \ "bootdelay=1\0" \ - "bootargs=console=ttymxc0,115200 root=/dev/ram0 rw --no-log initrd=0x1E000000,32M ramdisk=65536 video=${video_lvds} ${video_vmalloc} ${arg_option} autosh=${autoexec}\0" \ - "bootargs_ram=setenv bootargs console=ttymxc0,115200 root=/dev/ram0 rw --no-log initrd=0x1E000000,32M ramdisk=65536 ${video_lvds} ${video_vmalloc} ${arg_option} autosh=${autoexec}\0" \ - "bootargs_mmc=setenv bootargs console=ttymxc0,115200 root=/dev/mmcblk3p2 rw --no-log rootfstype=ext4 rootdelay=5 rootwait ${video_lvds} ${video_vmalloc} ${arg_option} autosh=${autoexec}\0" \ + "bootargs=console=ttymxc0,115200 root=/dev/ram0 rw --no-log initrd=0x1E000000,32M ramdisk=65536 video=${video_lvds} ${video_vmalloc} ${arg_option} autorun=${autoexec}\0" \ + "bootargs_ram=setenv bootargs console=ttymxc0,115200 root=/dev/ram0 rw --no-log initrd=0x1E000000,32M ramdisk=65536 ${video_lvds} ${video_vmalloc} ${arg_option} autorun=${autoexec}\0" \ + "bootargs_mmc=setenv bootargs console=ttymxc0,115200 root=/dev/mmcblk3p2 rw --no-log rootfstype=ext4 rootdelay=5 rootwait ${video_lvds} ${video_vmalloc} ${arg_option} autorun=${autoexec}\0" \ "ethaddr=00:FA:15:12:02:02\0" \ "eth1addr=00:FA:15:12:02:04\0" \ "serverip=192.168.10.131\0" \ @@ -195,11 +195,11 @@ "ip_dyn=yes\0" \ "video_lvds=video=mxcfb0:dev=ldb,LDB-LP133WD2,if=RGB24 ldb=spl0\0" \ "video_vmalloc=fbmem=192M vmalloc=400M\0" \ - "arg_option=loglevel=7\0" \ + "arg_option=loglevel=7 eth0ip=${ipaddr} eth0netmask=${netmask} eth0gw=${gatewayip}\0" \ "mmcdev=0\0" \ "tftpbase=prime-oven\0" \ "uboot_file=u-boot.imx\0" \ - "dtb_file=imx6sl-prime-oven.dtb\0" \ + "dtb_file=imx6s-prime-oven.dtb\0" \ "kernel_file=uImage\0" \ "ramdisk_file=ramdisk.imx6-2.0-64M.gz\0" \ "uboot=tftpboot 0x12000000 ${tftpbase}/${uboot_file}; mmc dev ${mmcdev}; mmc write 0x12000000 2 500; if ext4ls mmc ${mmcdev}:1 boot; then ext4writ mmc ${mmcdev}:1 0x12000000 /boot/${uboot_file} ${filesize}; fi;\0" \ diff --git a/buildroot/buildroot-2016.08.1/board/falinux/common/rootfs_overlay/etc/init.d/S82autoexec b/buildroot/buildroot-2016.08.1/board/falinux/common/rootfs_overlay/etc/init.d/S82autoexec index e0b1755..6f1758e 100755 --- a/buildroot/buildroot-2016.08.1/board/falinux/common/rootfs_overlay/etc/init.d/S82autoexec +++ b/buildroot/buildroot-2016.08.1/board/falinux/common/rootfs_overlay/etc/init.d/S82autoexec @@ -2,8 +2,8 @@ start() { ## APP auto run - EXEC=$(cmd_parsing exec $CMDLINE) - if [ "$EXEC" != "" ]; then + EXEC_AUTO_SH=$(cmd_parsing autorun $CMDLINE) + if [ "$EXEC_AUTO_SH" != "" ]; then for A in 1 2 3 4 5; do diff --git a/kernel/linux-imx6_3.14.28/arch/arm/boot/dts/Makefile b/kernel/linux-imx6_3.14.28/arch/arm/boot/dts/Makefile index 67a938a..be7e461 100644 --- a/kernel/linux-imx6_3.14.28/arch/arm/boot/dts/Makefile +++ b/kernel/linux-imx6_3.14.28/arch/arm/boot/dts/Makefile @@ -179,7 +179,7 @@ dtb-$(CONFIG_ARCH_MXC) += \ imx6dl-sp.dtb \ imx6dl-wandboard.dtb \ imx6dl-cmf.dtb \ - imx6sl-prime-qt5.dtb \ + imx6s-prime-oven.dtb \ imx6q-arm2.dtb \ imx6q-bt.dtb \ imx6q-bt2.dtb \ diff --git a/kernel/linux-imx6_3.14.28/arch/arm/boot/dts/imx6qdl-cmf.dtsi b/kernel/linux-imx6_3.14.28/arch/arm/boot/dts/imx6qdl-cmf.dtsi index 55b34ad..5cc45fd 100644 --- a/kernel/linux-imx6_3.14.28/arch/arm/boot/dts/imx6qdl-cmf.dtsi +++ b/kernel/linux-imx6_3.14.28/arch/arm/boot/dts/imx6qdl-cmf.dtsi @@ -236,8 +236,8 @@ / { aliases { - mmc0 = &usdhc3; - mmc1 = &usdhc4; + mmc2 = &usdhc3; + mmc3 = &usdhc4; mxcfb0 = &mxcfb1; mxcfb1 = &mxcfb2; }; diff --git a/kernel/linux-imx6_3.14.28/arch/arm/boot/dts/imx6qdl-prime-oven.dtsi b/kernel/linux-imx6_3.14.28/arch/arm/boot/dts/imx6qdl-prime-oven.dtsi old mode 100644 new mode 100755 index 55b34ad..748d010 --- a/kernel/linux-imx6_3.14.28/arch/arm/boot/dts/imx6qdl-prime-oven.dtsi +++ b/kernel/linux-imx6_3.14.28/arch/arm/boot/dts/imx6qdl-prime-oven.dtsi @@ -16,12 +16,12 @@ pinctrl-names = "default"; pinctrl-0 = <&pinctrl_hog>; - iomuxc_imx6q_cmf1000: iomuxc-imx6q-cmf1000grp { + iomuxc_imx6q_primeoven: iomuxc-imx6q-primeovengrp { status = "okay"; }; }; -&iomuxc_imx6q_cmf1000 { +&iomuxc_imx6q_primeoven { pinctrl_audmux: audmuxgrp { fsl,pins = < MX6QDL_PAD_CSI0_DAT7__AUD3_RXD 0x130b0 @@ -33,21 +33,10 @@ pinctrl_ecspi1: ecspi1grp { fsl,pins = < - MX6QDL_PAD_EIM_D17__ECSPI1_MISO 0x100b1 - MX6QDL_PAD_EIM_D18__ECSPI1_MOSI 0x100b1 - MX6QDL_PAD_EIM_D16__ECSPI1_SCLK 0x000b1 -#define GP_ECSPI1_CS <&gpio3 19 GPIO_ACTIVE_LOW> - MX6QDL_PAD_EIM_D19__GPIO3_IO19 0x0b0b1 - >; - }; - - pinctrl_ecspi2: ecspi2grp { - fsl,pins = < - MX6QDL_PAD_DISP0_DAT17__ECSPI2_MISO 0x100b1 - MX6QDL_PAD_DISP0_DAT16__ECSPI2_MOSI 0x100b1 - MX6QDL_PAD_DISP0_DAT19__ECSPI2_SCLK 0x000b1 -#define GP_ECSPI2_CS <&gpio5 12 GPIO_ACTIVE_LOW> - MX6QDL_PAD_DISP0_DAT18__GPIO5_IO12 0x0b0b1 + MX6QDL_PAD_EIM_D17__ECSPI1_MISO 0x100b1 /* MISO */ + MX6QDL_PAD_EIM_D18__ECSPI1_MOSI 0x100b1 /* MOSI */ + MX6QDL_PAD_EIM_D16__ECSPI1_SCLK 0x000b1 /* SLCK */ + MX6QDL_PAD_EIM_D19__GPIO3_IO19 0x0b0b1 /* SS1 */ >; }; @@ -69,34 +58,31 @@ MX6QDL_PAD_RGMII_RD3__RGMII_RD3 0x1b0b0 MX6QDL_PAD_RGMII_RX_CTL__RGMII_RX_CTL 0x1b0b0 MX6QDL_PAD_GPIO_16__ENET_REF_CLK 0x4001b0a8 -#define GP_ENET_PHY_RESET <&gpio1 25 GPIO_ACTIVE_LOW> MX6QDL_PAD_ENET_CRS_DV__GPIO1_IO25 0x0f0b0 /* ethernet phy reset */ -#define GPIRQ_ENET_PHY <&gpio1 26 IRQ_TYPE_LEVEL_LOW> MX6QDL_PAD_ENET_RXD1__GPIO1_IO26 0x1b0b0 /* ethernet phy interrupt */ >; }; pinctrl_gpio_leds: gpio-ledsgrp { fsl,pins = < -#define GP_CPU_LED1 <&gpio1 2 GPIO_ACTIVE_HIGH> - MX6QDL_PAD_GPIO_2__GPIO1_IO02 0x1b0b0 -#define GP_CPU_LED2 <&gpio2 4 GPIO_ACTIVE_HIGH> - MX6QDL_PAD_GPIO_4__GPIO1_IO04 0x1b0b0 + MX6QDL_PAD_GPIO_2__GPIO1_IO02 0x1b0b0 /* CPU-RUN */ + MX6QDL_PAD_GPIO_4__GPIO1_IO04 0x1b0b0 /* CPU-ERROR */ >; }; - pinctrl_hdmi_cec: hdmi_cecgrp { + pinctrl_hog: hoggrp { fsl,pins = < - MX6QDL_PAD_KEY_ROW2__HDMI_TX_CEC_LINE 0x1f8b0 + MX6QDL_PAD_NANDF_CLE__GPIO6_IO07 0x80000000 /* LCD Power Enable */ >; - }; + }; - pinctrl_hog: hoggrp { + pinctrl_pwm1: pwm1grp { fsl,pins = < - MX6QDL_PAD_EIM_D23__GPIO3_IO23 0x80000000 /* LCD Power Enable */ + MX6QDL_PAD_GPIO_9__PWM1_OUT 0x1b0b1 /* LCD Backlight */ >; }; + pinctrl_i2c1: i2c1grp { fsl,pins = < MX6QDL_PAD_CSI0_DAT9__I2C1_SCL 0x4001b8b1 @@ -117,46 +103,16 @@ >; }; - pinctrl_i2c2_max1180: i2c2-max1180grp { + pinctrl_i2c2_tsc2007: i2c2-tsc2007grp { fsl,pins = < -#define GPIRQ_MAX1180 <&gpio6 9 IRQ_TYPE_EDGE_FALLING> - MX6QDL_PAD_NANDF_WP_B__GPIO6_IO09 0x1b0b0 /* max1180 interrupt */ + MX6QDL_PAD_NANDF_WP_B__GPIO6_IO09 0x1b0b0 /* tsc2007 interrupt */ >; }; pinctrl_i2c3: i2c3grp { fsl,pins = < - MX6QDL_PAD_GPIO_5__I2C3_SCL 0x4001b8b1 - MX6QDL_PAD_GPIO_6__I2C3_SDA 0x4001b8b1 - >; - }; - - pinctrl_pwm1: pwm1grp { - fsl,pins = < - MX6QDL_PAD_GPIO_9__PWM1_OUT 0x1b0b1 - >; - }; - - pinctrl_pcie: pciegrp { - fsl,pins = < -#define GP_PCIE_RESET <&gpio6 11 GPIO_ACTIVE_HIGH> /* GPIO_ACTIVE_HIGH 0, GPIO_ACTIVE_LOW 1 */ - MX6QDL_PAD_NANDF_CS0__GPIO6_IO11 0x000b0 /* PCIe Reset */ -#define GP_PCIE_WAKE <&gpio6 14 GPIO_ACTIVE_HIGH> /* GPIO_ACTIVE_HIGH 0, GPIO_ACTIVE_LOW 1 */ - MX6QDL_PAD_NANDF_CS1__GPIO6_IO14 0x000b0 /* PCIe Wake */ - >; - }; - - pinctrl_reg_usbotg_vbus: reg-usbotg-vbusgrp { - fsl,pins = < -#define GP_REG_USBOTG <&gpio3 22 GPIO_ACTIVE_HIGH> - MX6QDL_PAD_EIM_D22__GPIO3_IO22 0x030b0 - >; - }; - - pinctrl_reg_wlan_en: reg-wlan-engrp { - fsl,pins = < -#define GP_REG_WLAN_EN <&gpio6 15 GPIO_ACTIVE_HIGH> - MX6QDL_PAD_NANDF_CS2__GPIO6_IO15 0x030b0 + MX6QDL_PAD_GPIO_5__I2C3_SCL 0x4001b8b1 + MX6QDL_PAD_GPIO_6__I2C3_SDA 0x4001b8b1 >; }; @@ -178,8 +134,6 @@ fsl,pins = < MX6QDL_PAD_EIM_D25__UART3_RX_DATA 0x1b0b1 MX6QDL_PAD_EIM_D24__UART3_TX_DATA 0x1b0b1 - MX6QDL_PAD_EIM_D31__UART3_CTS_B 0x1b0b1 - MX6QDL_PAD_EIM_D30__UART3_RTS_B 0x1b0b1 >; }; @@ -190,16 +144,9 @@ >; }; - pinctrl_usbh1: usbh1grp { - fsl,pins = < -#define GP_USBH1_HUB_RESET <&gpio7 12 GPIO_ACTIVE_LOW> - MX6QDL_PAD_GPIO_17__GPIO7_IO12 0x0b0b0 - >; - }; - pinctrl_usbotg: usbotggrp { fsl,pins = < - MX6QDL_PAD_GPIO_1__USB_OTG_ID 0x17059 + MX6QDL_PAD_ENET_RX_ER__USB_OTG_ID 0x17059 >; }; @@ -211,9 +158,7 @@ MX6QDL_PAD_SD3_DAT1__SD3_DATA1 0x17059 MX6QDL_PAD_SD3_DAT2__SD3_DATA2 0x17059 MX6QDL_PAD_SD3_DAT3__SD3_DATA3 0x17059 -#define GP_USDHC3_CD <&gpio7 0 GPIO_ACTIVE_LOW> MX6QDL_PAD_SD3_DAT5__GPIO7_IO00 0x1b0b0 -#define GP_USDHC3_WP <&gpio7 1 GPIO_ACTIVE_LOW> MX6QDL_PAD_SD3_DAT4__GPIO7_IO01 0x1b0b0 >; }; @@ -236,10 +181,9 @@ / { aliases { - mmc0 = &usdhc3; - mmc1 = &usdhc4; + mmc2 = &usdhc3; + mmc3 = &usdhc4; mxcfb0 = &mxcfb1; - mxcfb1 = &mxcfb2; }; clocks { @@ -251,7 +195,7 @@ }; memory { - reg = <0x10000000 0x40000000>; + reg = <0x10000000 0x40000000>; /* 1GByte */ }; leds { @@ -259,15 +203,15 @@ pinctrl-names = "default"; pinctrl-0 = <&pinctrl_gpio_leds>; - cpu-led1 { - label = "cpu-led1"; - gpios = GP_CPU_LED1; - linux,default-trigger = "time"; + cpu-run { + label = "cpu-run"; + gpios = <&gpio1 2 GPIO_ACTIVE_HIGH>; + linux,default-trigger = "timer"; retain-state-suspended; }; - cpu-led2 { - label = "cpu-led2"; - gpios = GP_CPU_LED2; + cpu-error { + label = "cpu-error"; + gpios = <&gpio1 4 GPIO_ACTIVE_LOW>; linux,default-trigger = "none"; retain-state-suspended; }; @@ -278,12 +222,12 @@ #address-cells = <1>; #size-cells = <0>; - reg_1p8v: regulator@0 { + reg_1p2v: regulator@0 { compatible = "regulator-fixed"; reg = <0>; - regulator-name = "1P8V"; - regulator-min-microvolt = <1800000>; - regulator-max-microvolt = <1800000>; + regulator-name = "1P2V"; + regulator-min-microvolt = <1200000>; + regulator-max-microvolt = <1200000>; regulator-always-on; }; @@ -309,11 +253,9 @@ compatible = "regulator-fixed"; reg = <3>; pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_reg_usbotg_vbus>; regulator-name = "usb_otg_vbus"; regulator-min-microvolt = <5000000>; regulator-max-microvolt = <5000000>; - gpio = GP_REG_USBOTG; enable-active-high; }; }; @@ -332,29 +274,11 @@ mux-ext-port = <3>; }; - sound-hdmi { - compatible = "fsl,imx6q-audio-hdmi", - "fsl,imx-audio-hdmi"; - model = "imx-audio-hdmi"; - hdmi-controller = <&hdmi_audio>; - }; - mxcfb1: fb@0 { compatible = "fsl,mxc_sdc_fb"; disp_dev = "ldb"; - interface_pix_fmt = "RGB24"; - default_bpp = <32>; - int_clk = <0>; - late_init = <0>; - status = "disabled"; - }; - - mxcfb2: fb@1 { - compatible = "fsl,mxc_sdc_fb"; - disp_dev = "hdmi"; - interface_pix_fmt = "RGB24"; - mode_str ="1920x1080M@60"; - default_bpp = <24>; + interface_pix_fmt = "RGB666"; + default_bpp = <16>; int_clk = <0>; late_init = <0>; status = "disabled"; @@ -366,29 +290,9 @@ brightness-levels = <0 1 2 3 4 5 6 7 8 9 10>; default-brightness-level = <8>; }; - - v4l2_cap_0: v4l2_cap_0 { - compatible = "fsl,imx6q-v4l2-capture"; - ipu_id = <0>; - csi_id = <0>; - mclk_source = <0>; - status = "okay"; - }; - - v4l2_cap_1: v4l2_cap_1 { - compatible = "fsl,imx6q-v4l2-capture"; - ipu_id = <0>; - csi_id = <1>; - mclk_source = <0>; - status = "okay"; - }; - - v4l2_out { - compatible = "fsl,mxc_v4l2_output"; - status = "okay"; - }; }; + &audmux { status = "okay"; pinctrl-names = "default"; @@ -397,7 +301,7 @@ &ecspi1 { fsl,spi-num-chipselects = <1>; - cs-gpios = GP_ECSPI1_CS; + cs-gpios = <&gpio3 19 GPIO_ACTIVE_LOW>; pinctrl-names = "default"; pinctrl-0 = <&pinctrl_ecspi1>; status = "okay"; @@ -410,27 +314,13 @@ }; }; -&ecspi2 { - fsl,spi-num-chipselects = <2>; - cs-gpios = GP_ECSPI2_CS; - pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_ecspi2>; - status = "okay"; - - spidev@0 { - compatible = "spidev"; - spi-max-frequency = <20000000>; - reg = <0>; - status = "okay"; - }; -}; &fec { pinctrl-names = "default"; pinctrl-0 = <&pinctrl_enet>; phy-mode = "rgmii"; #if 0 - phy-reset-gpios = GP_ENET_PHY_RESET; + phy-reset-gpios = <&gpio1 25 GPIO_ACTIVE_LOW>; #endif status = "okay"; @@ -438,32 +328,10 @@ #size-cells = <1>; phy_int { reg = <0x6>; - interrupts-extended = GPIRQ_ENET_PHY; + interrupts-extended = <&gpio1 25 GPIO_ACTIVE_LOW>; }; }; -&hdmi_audio { - status = "okay"; -}; - -&hdmi_cec { - pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_hdmi_cec>; - status = "okay"; -}; - -&hdmi_core { - ipu_id = <0>; - disp_id = <1>; - status = "okay"; -}; - -&hdmi_video { - fsl,phy_reg_vlev = <0x0294>; - fsl,phy_reg_cksymtx = <0x800d>; - status = "okay"; -}; - &i2c1 { clock-frequency = <100000>; pinctrl-names = "default"; @@ -476,7 +344,8 @@ pinctrl-0 = <&pinctrl_i2c1_sgtl5000>; reg = <0x0a>; clocks = <&clks 201>; - VDDA-supply = <®_2p5v>; + VDDA-supply = <®_3p3v>; + VDDD-supply = <®_1p2v>; VDDIO-supply = <®_3p3v>; }; }; @@ -487,23 +356,20 @@ pinctrl-0 = <&pinctrl_i2c2>; status = "okay"; - hdmi: edid@50 { - compatible = "fsl,imx6-hdmi-i2c"; - reg = <0x50>; - }; - rtc: ds1339@68 { compatible = "dallas,ds1339"; reg = <0x68>; }; - max1180: max11801@48 { - compatible = "maxim,max11801"; + tsc2007: tsc2007@48 { + compatible = "ti,tsc2007"; reg = <0x48>; pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_i2c2_max1180>; - interrupts-extended = GPIRQ_MAX1180; - work-mode = <0>; + pinctrl-0 = <&pinctrl_i2c2_tsc2007>; + interrupt-parent = <&gpio6>; + interrupts = <9 0>; + gpios = <&gpio6 9 0>; + ti,x-plate-ohms = <180>; }; }; @@ -515,39 +381,32 @@ }; &ldb { + split-mode = <1>; status = "okay"; lvds-channel@0 { fsl,data-mapping = "spwg"; - fsl,data-width = <24>; + fsl,data-width = <18>; status = "okay"; primary; display-timings { native-mode = <&timing0>; - timing0: LDB-G156BGE { - clock-frequency = <76000000>; - hactive = <1366>; - vactive = <768>; - hback-porch = <130>; - hfront-porch = <60>; - vback-porch = <32>; - vfront-porch = <3>; - hsync-len = <4>; - vsync-len = <3>; + timing0: LDB-LP133WD2 { + clock-frequency = <48870000>; + hactive = <1600>; + vactive = <900>; + hback-porch = <44>; + hfront-porch = <24>; + vback-porch = <7>; + vfront-porch = <2>; + hsync-len = <24>; + vsync-len = <3>; }; }; }; }; -&pcie { - pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_pcie>; - reset-gpio = GP_PCIE_RESET; - wake-up-gpio = GP_PCIE_WAKE; - status = "okay"; -}; - &pwm1 { pinctrl-names = "default"; pinctrl-0 = <&pinctrl_pwm1>; @@ -574,7 +433,6 @@ &uart3 { pinctrl-names = "default"; pinctrl-0 = <&pinctrl_uart3>; - fsl,uart-has-rtscts; status = "okay"; }; @@ -601,8 +459,8 @@ pinctrl-names = "default"; pinctrl-0 = <&pinctrl_usdhc3>; bus-width = <4>; - cd-gpios = GP_USDHC3_CD; - wp-gpios = GP_USDHC3_WP; + cd-gpios = <&gpio7 0 GPIO_ACTIVE_LOW>; + wp-gpios = <&gpio7 1 GPIO_ACTIVE_LOW>; vmmc-supply = <®_3p3v>; status = "okay"; }; @@ -616,4 +474,3 @@ keep-power-in-suspend; status = "okay"; }; - diff --git a/kernel/linux-imx6_3.14.28/arch/arm/boot/dts/imx6s-prime-oven.dts b/kernel/linux-imx6_3.14.28/arch/arm/boot/dts/imx6s-prime-oven.dts index a5c6cd4..29da467 100755 --- a/kernel/linux-imx6_3.14.28/arch/arm/boot/dts/imx6s-prime-oven.dts +++ b/kernel/linux-imx6_3.14.28/arch/arm/boot/dts/imx6s-prime-oven.dts @@ -26,10 +26,6 @@ status = "okay"; }; -&mxcfb2 { - status = "okay"; -}; - &ldb { lvds-channel@0 { crtc = "ipu1-di1"; diff --git a/kernel/linux-imx6_3.14.28/arch/arm/configs/imx6s_prime_oven_defconfig b/kernel/linux-imx6_3.14.28/arch/arm/configs/imx6s_prime_oven_defconfig index 9749b30..7dfaf33 100644 --- a/kernel/linux-imx6_3.14.28/arch/arm/configs/imx6s_prime_oven_defconfig +++ b/kernel/linux-imx6_3.14.28/arch/arm/configs/imx6s_prime_oven_defconfig @@ -155,7 +155,7 @@ CONFIG_EVENTFD=y CONFIG_SHMEM=y CONFIG_AIO=y CONFIG_PCI_QUIRKS=y -# CONFIG_EMBEDDED is not set +CONFIG_EMBEDDED=y CONFIG_HAVE_PERF_EVENTS=y CONFIG_PERF_USE_VMALLOC=y @@ -1835,7 +1835,7 @@ CONFIG_PINCTRL=y # CONFIG_PINMUX=y CONFIG_PINCONF=y -CONFIG_DEBUG_PINCTRL=y +# CONFIG_DEBUG_PINCTRL is not set # CONFIG_PINCTRL_CAPRI is not set CONFIG_PINCTRL_IMX=y CONFIG_PINCTRL_IMX6Q=y diff --git a/kernel/linux-imx6_3.14.28/make.sh b/kernel/linux-imx6_3.14.28/make.sh index 6f7171c..195b908 100755 --- a/kernel/linux-imx6_3.14.28/make.sh +++ b/kernel/linux-imx6_3.14.28/make.sh @@ -12,10 +12,10 @@ then fi image_filename="arch/arm/boot/uImage" -dtb_filename="arch/arm/boot/dts/imx6sl-prime-oven.dtb" +dtb_filename="arch/arm/boot/dts/imx6s-prime-oven.dtb" image_target_filename="uImage" -dtb_target_filename="imx6sl-prime-oven.dtb" +dtb_target_filename="imx6s-prime-oven.dtb" if [ -f .config ]; then echo ".....mrproper" @@ -29,9 +29,9 @@ fi if [ ! -f $build_path/.config ]; then - echo ".....imx6sl prime oven defconfig" + echo ".....imx6s prime oven defconfig" ARCH=arm make arm=ARM O=$build_path distclean - ARCH=arm make arm=ARM O=$build_path imx6sl_prime_oven_defconfig + ARCH=arm make arm=ARM O=$build_path imx6s_prime_oven_defconfig fi