[FE training-materials-updates] Update kernel lab instructions for 3.13

Michael Opdenacker michael.opdenacker at free-electrons.com
Sun Feb 2 06:04:35 CET 2014


Repository : git://git.free-electrons.com/training-materials.git

On branch  : master
Link       : http://git.free-electrons.com/training-materials/commit/?id=ee2ea6e9e53276a173adfca358cc191f1f915664

>---------------------------------------------------------------

commit ee2ea6e9e53276a173adfca358cc191f1f915664
Author: Michael Opdenacker <michael.opdenacker at free-electrons.com>
Date:   Sat Feb 1 17:41:41 2014 +0100

    Update kernel lab instructions for 3.13
    
    - No more need for a DTS patch to support the BBB
    
    Signed-off-by: Michael Opdenacker <michael.opdenacker at free-electrons.com>


>---------------------------------------------------------------

ee2ea6e9e53276a173adfca358cc191f1f915664
 ...2-am335x-bone-add-DT-for-BeagleBone-Black.patch |  562 --------------------
 .../kernel-compiling-and-nfs-booting.tex           |   25 -
 .../kernel-i2c-device-model.tex                    |    4 +-
 labs/kernel-module-simple/kernel-module-simple.tex |    4 +-
 labs/kernel-serial-iomem/kernel-serial-iomem.tex   |    4 +-
 .../kernel-sources-download.tex                    |    4 +-
 .../kernel-sources-exploring.tex                   |   10 +-
 7 files changed, 14 insertions(+), 599 deletions(-)

diff --git a/lab-data/linux/src/patches/0001-ARM-OMAP2-am335x-bone-add-DT-for-BeagleBone-Black.patch b/lab-data/linux/src/patches/0001-ARM-OMAP2-am335x-bone-add-DT-for-BeagleBone-Black.patch
deleted file mode 100644
index 033abe2..0000000
--- a/lab-data/linux/src/patches/0001-ARM-OMAP2-am335x-bone-add-DT-for-BeagleBone-Black.patch
+++ /dev/null
@@ -1,562 +0,0 @@
-From 95a875074b56324184422872739f966575056694 Mon Sep 17 00:00:00 2001
-From: Koen Kooi <koen at dominion.thruhere.net>
-Date: Fri, 6 Sep 2013 08:33:24 +0200
-Subject: [PATCH] ARM: OMAP2+: am335x-bone*: add DT for BeagleBone Black
-
-The BeagleBone Black is basically a regular BeagleBone with eMMC and HDMI added,
-so create a common dtsi both can use. MMC support for AM335x still isn't in, so
-only the LDO change has been added.
-
-Signed-off-by: Koen Kooi <koen at dominion.thruhere.net>
-Signed-off-by: Michael Opdenacker <michael.opdenacker at free-electrons.com>
----
- arch/arm/boot/dts/Makefile                |   1 +
- arch/arm/boot/dts/am335x-bone-common.dtsi | 262 ++++++++++++++++++++++++++++++
- arch/arm/boot/dts/am335x-bone.dts         | 227 +-------------------------
- arch/arm/boot/dts/am335x-boneblack.dts    |  18 ++
- 4 files changed, 282 insertions(+), 226 deletions(-)
- create mode 100644 arch/arm/boot/dts/am335x-bone-common.dtsi
- create mode 100644 arch/arm/boot/dts/am335x-boneblack.dts
-
-diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
-index 641b3c9..b7c0c52 100644
---- a/arch/arm/boot/dts/Makefile
-+++ b/arch/arm/boot/dts/Makefile
-@@ -171,6 +171,7 @@ dtb-$(CONFIG_ARCH_OMAP2PLUS) += omap2420-h4.dtb \
- 	am335x-evm.dtb \
- 	am335x-evmsk.dtb \
- 	am335x-bone.dtb \
-+	am335x-boneblack.dtb \
- 	am3517-evm.dtb \
- 	am3517_mt_ventoux.dtb \
- 	am43x-epos-evm.dtb
-diff --git a/arch/arm/boot/dts/am335x-bone-common.dtsi b/arch/arm/boot/dts/am335x-bone-common.dtsi
-new file mode 100644
-index 0000000..2f66ded
---- /dev/null
-+++ b/arch/arm/boot/dts/am335x-bone-common.dtsi
-@@ -0,0 +1,262 @@
-+/*
-+ * Copyright (C) 2012 Texas Instruments Incorporated - http://www.ti.com/
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License version 2 as
-+ * published by the Free Software Foundation.
-+ */
-+
-+/ {
-+	model = "TI AM335x BeagleBone";
-+	compatible = "ti,am335x-bone", "ti,am33xx";
-+
-+	cpus {
-+		cpu at 0 {
-+			cpu0-supply = <&dcdc2_reg>;
-+		};
-+	};
-+
-+	memory {
-+		device_type = "memory";
-+		reg = <0x80000000 0x10000000>; /* 256 MB */
-+	};
-+
-+	am33xx_pinmux: pinmux at 44e10800 {
-+		pinctrl-names = "default";
-+		pinctrl-0 = <&clkout2_pin>;
-+
-+		user_leds_s0: user_leds_s0 {
-+			pinctrl-single,pins = <
-+				0x54 (PIN_OUTPUT_PULLDOWN | MUX_MODE7)	/* gpmc_a5.gpio1_21 */
-+				0x58 (PIN_OUTPUT_PULLUP | MUX_MODE7)	/* gpmc_a6.gpio1_22 */
-+				0x5c (PIN_OUTPUT_PULLDOWN | MUX_MODE7)	/* gpmc_a7.gpio1_23 */
-+				0x60 (PIN_OUTPUT_PULLUP | MUX_MODE7)	/* gpmc_a8.gpio1_24 */
-+			>;
-+		};
-+
-+		i2c0_pins: pinmux_i2c0_pins {
-+			pinctrl-single,pins = <
-+				0x188 (PIN_INPUT_PULLUP | MUX_MODE0)	/* i2c0_sda.i2c0_sda */
-+				0x18c (PIN_INPUT_PULLUP | MUX_MODE0)	/* i2c0_scl.i2c0_scl */
-+			>;
-+		};
-+
-+		uart0_pins: pinmux_uart0_pins {
-+			pinctrl-single,pins = <
-+				0x170 (PIN_INPUT_PULLUP | MUX_MODE0)	/* uart0_rxd.uart0_rxd */
-+				0x174 (PIN_OUTPUT_PULLDOWN | MUX_MODE0)	/* uart0_txd.uart0_txd */
-+			>;
-+		};
-+
-+		clkout2_pin: pinmux_clkout2_pin {
-+			pinctrl-single,pins = <
-+				0x1b4 (PIN_OUTPUT_PULLDOWN | MUX_MODE3)	/* xdma_event_intr1.clkout2 */
-+			>;
-+		};
-+
-+		cpsw_default: cpsw_default {
-+			pinctrl-single,pins = <
-+				/* Slave 1 */
-+				0x110 (PIN_INPUT_PULLUP | MUX_MODE0)	/* mii1_rxerr.mii1_rxerr */
-+				0x114 (PIN_OUTPUT_PULLDOWN | MUX_MODE0)	/* mii1_txen.mii1_txen */
-+				0x118 (PIN_INPUT_PULLUP | MUX_MODE0)	/* mii1_rxdv.mii1_rxdv */
-+				0x11c (PIN_OUTPUT_PULLDOWN | MUX_MODE0)	/* mii1_txd3.mii1_txd3 */
-+				0x120 (PIN_OUTPUT_PULLDOWN | MUX_MODE0)	/* mii1_txd2.mii1_txd2 */
-+				0x124 (PIN_OUTPUT_PULLDOWN | MUX_MODE0)	/* mii1_txd1.mii1_txd1 */
-+				0x128 (PIN_OUTPUT_PULLDOWN | MUX_MODE0)	/* mii1_txd0.mii1_txd0 */
-+				0x12c (PIN_INPUT_PULLUP | MUX_MODE0)	/* mii1_txclk.mii1_txclk */
-+				0x130 (PIN_INPUT_PULLUP | MUX_MODE0)	/* mii1_rxclk.mii1_rxclk */
-+				0x134 (PIN_INPUT_PULLUP | MUX_MODE0)	/* mii1_rxd3.mii1_rxd3 */
-+				0x138 (PIN_INPUT_PULLUP | MUX_MODE0)	/* mii1_rxd2.mii1_rxd2 */
-+				0x13c (PIN_INPUT_PULLUP | MUX_MODE0)	/* mii1_rxd1.mii1_rxd1 */
-+				0x140 (PIN_INPUT_PULLUP | MUX_MODE0)	/* mii1_rxd0.mii1_rxd0 */
-+			>;
-+		};
-+
-+		cpsw_sleep: cpsw_sleep {
-+			pinctrl-single,pins = <
-+				/* Slave 1 reset value */
-+				0x110 (PIN_INPUT_PULLDOWN | MUX_MODE7)
-+				0x114 (PIN_INPUT_PULLDOWN | MUX_MODE7)
-+				0x118 (PIN_INPUT_PULLDOWN | MUX_MODE7)
-+				0x11c (PIN_INPUT_PULLDOWN | MUX_MODE7)
-+				0x120 (PIN_INPUT_PULLDOWN | MUX_MODE7)
-+				0x124 (PIN_INPUT_PULLDOWN | MUX_MODE7)
-+				0x128 (PIN_INPUT_PULLDOWN | MUX_MODE7)
-+				0x12c (PIN_INPUT_PULLDOWN | MUX_MODE7)
-+				0x130 (PIN_INPUT_PULLDOWN | MUX_MODE7)
-+				0x134 (PIN_INPUT_PULLDOWN | MUX_MODE7)
-+				0x138 (PIN_INPUT_PULLDOWN | MUX_MODE7)
-+				0x13c (PIN_INPUT_PULLDOWN | MUX_MODE7)
-+				0x140 (PIN_INPUT_PULLDOWN | MUX_MODE7)
-+			>;
-+		};
-+
-+		davinci_mdio_default: davinci_mdio_default {
-+			pinctrl-single,pins = <
-+				/* MDIO */
-+				0x148 (PIN_INPUT_PULLUP | SLEWCTRL_FAST | MUX_MODE0)	/* mdio_data.mdio_data */
-+				0x14c (PIN_OUTPUT_PULLUP | MUX_MODE0)			/* mdio_clk.mdio_clk */
-+			>;
-+		};
-+
-+		davinci_mdio_sleep: davinci_mdio_sleep {
-+			pinctrl-single,pins = <
-+				/* MDIO reset value */
-+				0x148 (PIN_INPUT_PULLDOWN | MUX_MODE7)
-+				0x14c (PIN_INPUT_PULLDOWN | MUX_MODE7)
-+			>;
-+		};
-+	};
-+
-+	ocp {
-+		uart0: serial at 44e09000 {
-+			pinctrl-names = "default";
-+			pinctrl-0 = <&uart0_pins>;
-+
-+			status = "okay";
-+		};
-+
-+		musb: usb at 47400000 {
-+			status = "okay";
-+
-+			control at 44e10000 {
-+				status = "okay";
-+			};
-+
-+			usb-phy at 47401300 {
-+				status = "okay";
-+			};
-+
-+			usb-phy at 47401b00 {
-+				status = "okay";
-+			};
-+
-+			usb at 47401000 {
-+				status = "okay";
-+			};
-+
-+			usb at 47401800 {
-+				status = "okay";
-+				dr_mode = "host";
-+			};
-+
-+			dma-controller at 07402000  {
-+				status = "okay";
-+			};
-+		};
-+
-+		i2c0: i2c at 44e0b000 {
-+			pinctrl-names = "default";
-+			pinctrl-0 = <&i2c0_pins>;
-+
-+			status = "okay";
-+			clock-frequency = <400000>;
-+
-+			tps: tps at 24 {
-+				reg = <0x24>;
-+			};
-+
-+		};
-+	};
-+
-+	leds {
-+		pinctrl-names = "default";
-+		pinctrl-0 = <&user_leds_s0>;
-+
-+		compatible = "gpio-leds";
-+
-+		led at 2 {
-+			label = "beaglebone:green:heartbeat";
-+			gpios = <&gpio1 21 GPIO_ACTIVE_HIGH>;
-+			linux,default-trigger = "heartbeat";
-+			default-state = "off";
-+		};
-+
-+		led at 3 {
-+			label = "beaglebone:green:mmc0";
-+			gpios = <&gpio1 22 GPIO_ACTIVE_HIGH>;
-+			linux,default-trigger = "mmc0";
-+			default-state = "off";
-+		};
-+
-+		led at 4 {
-+			label = "beaglebone:green:usr2";
-+			gpios = <&gpio1 23 GPIO_ACTIVE_HIGH>;
-+			default-state = "off";
-+		};
-+
-+		led at 5 {
-+			label = "beaglebone:green:usr3";
-+			gpios = <&gpio1 24 GPIO_ACTIVE_HIGH>;
-+			default-state = "off";
-+		};
-+	};
-+};
-+
-+/include/ "tps65217.dtsi"
-+
-+&tps {
-+	regulators {
-+		dcdc1_reg: regulator at 0 {
-+			regulator-always-on;
-+		};
-+
-+		dcdc2_reg: regulator at 1 {
-+			/* VDD_MPU voltage limits 0.95V - 1.26V with +/-4% tolerance */
-+			regulator-name = "vdd_mpu";
-+			regulator-min-microvolt = <925000>;
-+			regulator-max-microvolt = <1325000>;
-+			regulator-boot-on;
-+			regulator-always-on;
-+		};
-+
-+		dcdc3_reg: regulator at 2 {
-+			/* VDD_CORE voltage limits 0.95V - 1.1V with +/-4% tolerance */
-+			regulator-name = "vdd_core";
-+			regulator-min-microvolt = <925000>;
-+			regulator-max-microvolt = <1150000>;
-+			regulator-boot-on;
-+			regulator-always-on;
-+		};
-+
-+		ldo1_reg: regulator at 3 {
-+			regulator-always-on;
-+		};
-+
-+		ldo2_reg: regulator at 4 {
-+			regulator-always-on;
-+		};
-+
-+		ldo3_reg: regulator at 5 {
-+			regulator-always-on;
-+		};
-+
-+		ldo4_reg: regulator at 6 {
-+			regulator-always-on;
-+		};
-+	};
-+};
-+
-+&cpsw_emac0 {
-+	phy_id = <&davinci_mdio>, <0>;
-+	phy-mode = "mii";
-+};
-+
-+&cpsw_emac1 {
-+	phy_id = <&davinci_mdio>, <1>;
-+	phy-mode = "mii";
-+};
-+
-+&mac {
-+	pinctrl-names = "default", "sleep";
-+	pinctrl-0 = <&cpsw_default>;
-+	pinctrl-1 = <&cpsw_sleep>;
-+
-+};
-+
-+&davinci_mdio {
-+	pinctrl-names = "default", "sleep";
-+	pinctrl-0 = <&davinci_mdio_default>;
-+	pinctrl-1 = <&davinci_mdio_sleep>;
-+};
-diff --git a/arch/arm/boot/dts/am335x-bone.dts b/arch/arm/boot/dts/am335x-bone.dts
-index 444b4ed..7993c48 100644
---- a/arch/arm/boot/dts/am335x-bone.dts
-+++ b/arch/arm/boot/dts/am335x-bone.dts
-@@ -8,229 +8,4 @@
- /dts-v1/;
- 
- #include "am33xx.dtsi"
--
--/ {
--	model = "TI AM335x BeagleBone";
--	compatible = "ti,am335x-bone", "ti,am33xx";
--
--	cpus {
--		cpu at 0 {
--			cpu0-supply = <&dcdc2_reg>;
--		};
--	};
--
--	memory {
--		device_type = "memory";
--		reg = <0x80000000 0x10000000>; /* 256 MB */
--	};
--
--	am33xx_pinmux: pinmux at 44e10800 {
--		pinctrl-names = "default";
--		pinctrl-0 = <&clkout2_pin>;
--
--		user_leds_s0: user_leds_s0 {
--			pinctrl-single,pins = <
--				0x54 (PIN_OUTPUT_PULLDOWN | MUX_MODE7)	/* gpmc_a5.gpio1_21 */
--				0x58 (PIN_OUTPUT_PULLUP | MUX_MODE7)	/* gpmc_a6.gpio1_22 */
--				0x5c (PIN_OUTPUT_PULLDOWN | MUX_MODE7)	/* gpmc_a7.gpio1_23 */
--				0x60 (PIN_OUTPUT_PULLUP | MUX_MODE7)	/* gpmc_a8.gpio1_24 */
--			>;
--		};
--
--		i2c0_pins: pinmux_i2c0_pins {
--			pinctrl-single,pins = <
--				0x188 (PIN_INPUT_PULLUP | MUX_MODE0)	/* i2c0_sda.i2c0_sda */
--				0x18c (PIN_INPUT_PULLUP | MUX_MODE0)	/* i2c0_scl.i2c0_scl */
--			>;
--		};
--
--		uart0_pins: pinmux_uart0_pins {
--			pinctrl-single,pins = <
--				0x170 (PIN_INPUT_PULLUP | MUX_MODE0)	/* uart0_rxd.uart0_rxd */
--				0x174 (PIN_OUTPUT_PULLDOWN | MUX_MODE0)	/* uart0_txd.uart0_txd */
--			>;
--		};
--
--		clkout2_pin: pinmux_clkout2_pin {
--			pinctrl-single,pins = <
--				0x1b4 (PIN_OUTPUT_PULLDOWN | MUX_MODE3)	/* xdma_event_intr1.clkout2 */
--			>;
--		};
--
--		cpsw_default: cpsw_default {
--			pinctrl-single,pins = <
--				/* Slave 1 */
--				0x110 (PIN_INPUT_PULLUP | MUX_MODE0)	/* mii1_rxerr.mii1_rxerr */
--				0x114 (PIN_OUTPUT_PULLDOWN | MUX_MODE0)	/* mii1_txen.mii1_txen */
--				0x118 (PIN_INPUT_PULLUP | MUX_MODE0)	/* mii1_rxdv.mii1_rxdv */
--				0x11c (PIN_OUTPUT_PULLDOWN | MUX_MODE0)	/* mii1_txd3.mii1_txd3 */
--				0x120 (PIN_OUTPUT_PULLDOWN | MUX_MODE0)	/* mii1_txd2.mii1_txd2 */
--				0x124 (PIN_OUTPUT_PULLDOWN | MUX_MODE0)	/* mii1_txd1.mii1_txd1 */
--				0x128 (PIN_OUTPUT_PULLDOWN | MUX_MODE0)	/* mii1_txd0.mii1_txd0 */
--				0x12c (PIN_INPUT_PULLUP | MUX_MODE0)	/* mii1_txclk.mii1_txclk */
--				0x130 (PIN_INPUT_PULLUP | MUX_MODE0)	/* mii1_rxclk.mii1_rxclk */
--				0x134 (PIN_INPUT_PULLUP | MUX_MODE0)	/* mii1_rxd3.mii1_rxd3 */
--				0x138 (PIN_INPUT_PULLUP | MUX_MODE0)	/* mii1_rxd2.mii1_rxd2 */
--				0x13c (PIN_INPUT_PULLUP | MUX_MODE0)	/* mii1_rxd1.mii1_rxd1 */
--				0x140 (PIN_INPUT_PULLUP | MUX_MODE0)	/* mii1_rxd0.mii1_rxd0 */
--			>;
--		};
--
--		cpsw_sleep: cpsw_sleep {
--			pinctrl-single,pins = <
--				/* Slave 1 reset value */
--				0x110 (PIN_INPUT_PULLDOWN | MUX_MODE7)
--				0x114 (PIN_INPUT_PULLDOWN | MUX_MODE7)
--				0x118 (PIN_INPUT_PULLDOWN | MUX_MODE7)
--				0x11c (PIN_INPUT_PULLDOWN | MUX_MODE7)
--				0x120 (PIN_INPUT_PULLDOWN | MUX_MODE7)
--				0x124 (PIN_INPUT_PULLDOWN | MUX_MODE7)
--				0x128 (PIN_INPUT_PULLDOWN | MUX_MODE7)
--				0x12c (PIN_INPUT_PULLDOWN | MUX_MODE7)
--				0x130 (PIN_INPUT_PULLDOWN | MUX_MODE7)
--				0x134 (PIN_INPUT_PULLDOWN | MUX_MODE7)
--				0x138 (PIN_INPUT_PULLDOWN | MUX_MODE7)
--				0x13c (PIN_INPUT_PULLDOWN | MUX_MODE7)
--				0x140 (PIN_INPUT_PULLDOWN | MUX_MODE7)
--			>;
--		};
--
--		davinci_mdio_default: davinci_mdio_default {
--			pinctrl-single,pins = <
--				/* MDIO */
--				0x148 (PIN_INPUT_PULLUP | SLEWCTRL_FAST | MUX_MODE0)	/* mdio_data.mdio_data */
--				0x14c (PIN_OUTPUT_PULLUP | MUX_MODE0)			/* mdio_clk.mdio_clk */
--			>;
--		};
--
--		davinci_mdio_sleep: davinci_mdio_sleep {
--			pinctrl-single,pins = <
--				/* MDIO reset value */
--				0x148 (PIN_INPUT_PULLDOWN | MUX_MODE7)
--				0x14c (PIN_INPUT_PULLDOWN | MUX_MODE7)
--			>;
--		};
--	};
--
--	ocp {
--		uart0: serial at 44e09000 {
--			pinctrl-names = "default";
--			pinctrl-0 = <&uart0_pins>;
--
--			status = "okay";
--		};
--
--		i2c0: i2c at 44e0b000 {
--			pinctrl-names = "default";
--			pinctrl-0 = <&i2c0_pins>;
--
--			status = "okay";
--			clock-frequency = <400000>;
--
--			tps: tps at 24 {
--				reg = <0x24>;
--			};
--
--		};
--	};
--
--	leds {
--		pinctrl-names = "default";
--		pinctrl-0 = <&user_leds_s0>;
--
--		compatible = "gpio-leds";
--
--		led at 2 {
--			label = "beaglebone:green:heartbeat";
--			gpios = <&gpio1 21 GPIO_ACTIVE_HIGH>;
--			linux,default-trigger = "heartbeat";
--			default-state = "off";
--		};
--
--		led at 3 {
--			label = "beaglebone:green:mmc0";
--			gpios = <&gpio1 22 GPIO_ACTIVE_HIGH>;
--			linux,default-trigger = "mmc0";
--			default-state = "off";
--		};
--
--		led at 4 {
--			label = "beaglebone:green:usr2";
--			gpios = <&gpio1 23 GPIO_ACTIVE_HIGH>;
--			default-state = "off";
--		};
--
--		led at 5 {
--			label = "beaglebone:green:usr3";
--			gpios = <&gpio1 24 GPIO_ACTIVE_HIGH>;
--			default-state = "off";
--		};
--	};
--};
--
--/include/ "tps65217.dtsi"
--
--&tps {
--	regulators {
--		dcdc1_reg: regulator at 0 {
--			regulator-always-on;
--		};
--
--		dcdc2_reg: regulator at 1 {
--			/* VDD_MPU voltage limits 0.95V - 1.26V with +/-4% tolerance */
--			regulator-name = "vdd_mpu";
--			regulator-min-microvolt = <925000>;
--			regulator-max-microvolt = <1325000>;
--			regulator-boot-on;
--			regulator-always-on;
--		};
--
--		dcdc3_reg: regulator at 2 {
--			/* VDD_CORE voltage limits 0.95V - 1.1V with +/-4% tolerance */
--			regulator-name = "vdd_core";
--			regulator-min-microvolt = <925000>;
--			regulator-max-microvolt = <1150000>;
--			regulator-boot-on;
--			regulator-always-on;
--		};
--
--		ldo1_reg: regulator at 3 {
--			regulator-always-on;
--		};
--
--		ldo2_reg: regulator at 4 {
--			regulator-always-on;
--		};
--
--		ldo3_reg: regulator at 5 {
--			regulator-always-on;
--		};
--
--		ldo4_reg: regulator at 6 {
--			regulator-always-on;
--		};
--	};
--};
--
--&cpsw_emac0 {
--	phy_id = <&davinci_mdio>, <0>;
--	phy-mode = "mii";
--};
--
--&cpsw_emac1 {
--	phy_id = <&davinci_mdio>, <1>;
--	phy-mode = "mii";
--};
--
--&mac {
--	pinctrl-names = "default", "sleep";
--	pinctrl-0 = <&cpsw_default>;
--	pinctrl-1 = <&cpsw_sleep>;
--
--};
--
--&davinci_mdio {
--	pinctrl-names = "default", "sleep";
--	pinctrl-0 = <&davinci_mdio_default>;
--	pinctrl-1 = <&davinci_mdio_sleep>;
--};
-+#include "am335x-bone-common.dtsi"
-diff --git a/arch/arm/boot/dts/am335x-boneblack.dts b/arch/arm/boot/dts/am335x-boneblack.dts
-new file mode 100644
-index 0000000..68d12aa
---- /dev/null
-+++ b/arch/arm/boot/dts/am335x-boneblack.dts
-@@ -0,0 +1,18 @@
-+/*
-+ * Copyright (C) 2012 Texas Instruments Incorporated - http://www.ti.com/
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License version 2 as
-+ * published by the Free Software Foundation.
-+ */
-+/dts-v1/;
-+
-+#include "am33xx.dtsi"
-+#include "am335x-bone-common.dtsi"
-+
-+&ldo3_reg {
-+	regulator-min-microvolt = <1800000>;
-+	regulator-max-microvolt = <1800000>;
-+	regulator-always-on;
-+};
-+
--- 
-1.8.1.2
-
diff --git a/labs/kernel-compiling-and-nfs-booting/kernel-compiling-and-nfs-booting.tex b/labs/kernel-compiling-and-nfs-booting/kernel-compiling-and-nfs-booting.tex
index 331de1e..2caae2e 100644
--- a/labs/kernel-compiling-and-nfs-booting/kernel-compiling-and-nfs-booting.tex
+++ b/labs/kernel-compiling-and-nfs-booting/kernel-compiling-and-nfs-booting.tex
@@ -51,31 +51,6 @@ sudo apt-get install libqt4-dev g++ u-boot-tools
 \code{u-boot-tools} is needed to build the \code{uImage} file for
 U-boot (\code{mkimage} utility).
 
-\section{Apply a kernel patch for BeagleBone Black}
-
-At the time of this writing, the mainline Linux 3.11 kernel is missing a 
-specific Device Tree Source (DTS) file for the BeagleBone Black.
-Without it, you could use the DTS for the original Beagle Bone, but it
-would blow up the HDMI transceiver after a dozen boots \footnote{See
-\url{http://article.gmane.org/gmane.linux.kernel.stable/63648} for
-details.}. 
-
-We are providing a patch to add such a DTS file. Let's create 
-a branch, starting from our \code{3.11.y} branch, and including this
-patch.
-
-First, make sure you are in the \code{3.11.y} branch:
-\begin{verbatim}
-git branch
-\end{verbatim}
-
-Then, let's create the new branch and apply the patch for BeagleBone
-Black:
-\begin{verbatim}
-git checkout -b 3.11.y-bbb
-git am ../patches/0001-ARM-OMAP2-*.patch
-\end{verbatim}
- 
 \section{Cross-compiling toolchain setup}
 
 We are going to install a cross-compiling toolchain from Linaro, a
diff --git a/labs/kernel-i2c-device-model/kernel-i2c-device-model.tex b/labs/kernel-i2c-device-model/kernel-i2c-device-model.tex
index 199a390..454e1e8 100644
--- a/labs/kernel-i2c-device-model/kernel-i2c-device-model.tex
+++ b/labs/kernel-i2c-device-model/kernel-i2c-device-model.tex
@@ -17,10 +17,10 @@ device/driver match.
 \section{Setup}
 
 Go to the \code{~/felabs/linux/src/linux} directory. Check out the
-\code{3.11.y-bbb} branch. 
+\code{3.13.y} branch. 
 
 Now create a new \code{nunchuk} branch starting from the
-\code{3.11.y-bbb} branch,  for your upcoming work on the nunchuk
+\code{3.13.y} branch,  for your upcoming work on the nunchuk
 driver.  
 
 \section{Connecting the nunchuk}
diff --git a/labs/kernel-module-simple/kernel-module-simple.tex b/labs/kernel-module-simple/kernel-module-simple.tex
index 043a777..bfe2abf 100644
--- a/labs/kernel-module-simple/kernel-module-simple.tex
+++ b/labs/kernel-module-simple/kernel-module-simple.tex
@@ -119,7 +119,7 @@ As we are going to make changes to the kernel sources, first create a
 special branch for such changes:
 
 \begin{verbatim}
-git checkout 3.11.y-bbb
+git checkout 3.13.y
 git checkout -b hello
 \end{verbatim}
 
@@ -169,7 +169,7 @@ from the commits between your branch and another branch, usually the
 one you started from:
 
 \begin{verbatim}
-git format-patch 3.11.y-bbb
+git format-patch 3.13.y
 \end{verbatim}
 
 Have a look at the generated file. You can see that its name reused
diff --git a/labs/kernel-serial-iomem/kernel-serial-iomem.tex b/labs/kernel-serial-iomem/kernel-serial-iomem.tex
index efa2b9c..871667c 100644
--- a/labs/kernel-serial-iomem/kernel-serial-iomem.tex
+++ b/labs/kernel-serial-iomem/kernel-serial-iomem.tex
@@ -22,8 +22,8 @@ is independent from the nunchuk changes, it's best to create a separate
 branch!
 
 \begin{verbatim}
-git checkout 3.11.y-bbb
-git checkout  -b uart
+git checkout 3.13.y
+git checkout -b uart
 \end{verbatim}
 
 \section{Add UART devices}
diff --git a/labs/kernel-sources-download/kernel-sources-download.tex b/labs/kernel-sources-download/kernel-sources-download.tex
index 68eac7f..aa604a1 100644
--- a/labs/kernel-sources-download/kernel-sources-download.tex
+++ b/labs/kernel-sources-download/kernel-sources-download.tex
@@ -94,8 +94,8 @@ git fetch stable
 \end{verbatim}
 }
 
-This still represents about 80 MB worth of git objects to download, as
-the time of this writing (as of 3.11.1).
+This still represents many git objects to download (80 MB when 3.11 was
+the latest version).
 
 We will choose a particular stable version in the next labs.
 
diff --git a/labs/kernel-sources-exploring/kernel-sources-exploring.tex b/labs/kernel-sources-exploring/kernel-sources-exploring.tex
index 08f7803..02dcb2f 100644
--- a/labs/kernel-sources-exploring/kernel-sources-exploring.tex
+++ b/labs/kernel-sources-exploring/kernel-sources-exploring.tex
@@ -26,18 +26,18 @@ cd ~/felabs/linux/src/linux
 git branch -a
 \end{verbatim} 
 
-As we want to work with the Linux 3.11 stable branch, the remote branch
-we are interested in is \code{remotes/stable/linux-3.11.y}.
+As we want to work with the Linux 3.13 stable branch, the remote branch
+we are interested in is \code{remotes/stable/linux-3.13.y}.
 
 First, open the \code{Makefile} file just to check the Linux kernel
 version that you currently have.
 
 Now, let's create a local branch starting from that remote branch:
 \begin{verbatim}
-git checkout -b 3.11.y stable/linux-3.11.y
+git checkout -b 3.13.y stable/linux-3.13.y
 \end{verbatim} 
 
-Open \code{Makefile} again and make sure you now have a 3.11.y version. 
+Open \code{Makefile} again and make sure you now have a 3.13.y version. 
 
 \section{Exploring the sources manually}
 
@@ -47,6 +47,8 @@ exploring the kernel sources.
 
 \begin{enumerate}
 \item Find the Linux logo image in the sources
+      \footnote{Look for files in \code{logo} in their name. It's an 
+      opportunity to practise with the \code{find} command.}
 \item Find who the maintainer of the MVNETA network driver is.
 \item Find the declaration of the \code{platform_device_register()} function.
 \end{enumerate}



More information about the training-materials-updates mailing list