Eric Lee / smarc-uboot | Embedian Git Server

Commit 8993056fb3d4af4f0cd078df20130d4e7c35c2f7

Authored by Dmitry Korunov 2017-11-26 17:38:53 +0800

Committed by Tom Rini 2017-12-04 22:59:02 +0800

Exists in smarc_8mq_lf_v2020.04 and in 17 other branches

add support for Raspberry Pi Zero W

Signed-off-by: Dmitry Korunov <dessel.k@gmail.com>

Showing 5 changed files with 76 additions and 1 deletions Inline Diff

arch/arm/dts/bcm2835-rpi-zero-w.dts
arch/arm/mach-bcm283x/Kconfig
board/raspberrypi/rpi/rpi.c
configs/rpi_0_w_defconfig
include/configs/rpi.h

arch/arm/dts/bcm2835-rpi-zero-w.dts

Diff comments View file @ 8993056

File was created	1	/dts-v1/;
	2	#include "bcm2835.dtsi"
	3	#include "bcm2835-rpi.dtsi"
	4	#include "bcm283x-rpi-smsc9512.dtsi"
	5	#include "bcm283x-rpi-usb-host.dtsi"
	6
	7	/ {
	8	compatible = "raspberrypi,model-zero-w", "brcm,bcm2835";
	9	model = "Raspberry Pi Zero W";
	10
	11	leds {
	12	act {
	13	gpios = <&gpio 47 0>;
	14	};
	15	};
	16	};
	17
	18	&uart1 {
	19	pinctrl-names = "default";
	20	pinctrl-0 = <&uart1_gpio14>;
	21	status = "okay";
	22	};
	23
	24	&hdmi {
	25	hpd-gpios = <&gpio 46 GPIO_ACTIVE_LOW>;
	26	};
	27

arch/arm/mach-bcm283x/Kconfig

Diff comments View file @ 8993056

 config BCM2835
 	bool "Broadcom BCM2835 SoC support"
 	depends on ARCH_BCM283X
 	select CPU_ARM1176
 config BCM2836
 	bool "Broadcom BCM2836 SoC support"
 	depends on ARCH_BCM283X
 	select ARMV7_LPAE
 	select CPU_V7
 config BCM2837
 	bool "Broadcom BCM2837 SoC support"
 	depends on ARCH_BCM283X
 config BCM2837_32B
 	bool "Broadcom BCM2837 SoC 32-bit support"
 	depends on ARCH_BCM283X
 	select BCM2837
 	select ARMV7_LPAE
 	select CPU_V7
 config BCM2837_64B
 	bool "Broadcom BCM2837 SoC 64-bit support"
 	depends on ARCH_BCM283X
 	select BCM2837
 	select ARM64
 menu "Broadcom BCM283X family"
 	depends on ARCH_BCM283X
 choice
 	prompt "Broadcom BCM283X board select"
 	optional
 config TARGET_RPI
 	bool "Raspberry Pi (all BCM2835 variants)"
 	help
 	  Support for all ARM1176-/BCM2835-based Raspberry Pi variants, such as
 	  the A, A+, B, B+, Compute Module, and Zero. This option cannot
 	  support BCM2836/BCM2837-based Raspberry Pis such as the RPi 2 and
 	  RPi 3 due to different peripheral address maps.
 	  This option creates a build targetting the ARM1176 ISA.
 	select BCM2835
+config TARGET_RPI_0_W
+	bool "Raspberry Pi Zero W"
+	help
+	  Support for all ARM1176-/BCM2835-based Raspberry Pi variants, such as
+	  the RPi Zero model W.
+	  This option assumes the VideoCore firmware is configured to use the
+	  mini UART (rather than PL011) for the serial console. This is the
+	  default on the RPi Zero W. To enable the UART console, the following
+	  non-default option must be present in config.txt: enable_uart=1.
+	  This is required for U-Boot to operate correctly, even if you only
+	  care about the HDMI/usbkbd console.
+	  This option creates a build targetting the ARMv7/AArch32 ISA.
+	select BCM2835
 config TARGET_RPI_2
 	bool "Raspberry Pi 2"
 	help
 	  Support for all BCM2836-based Raspberry Pi variants, such as
 	  the RPi 2 model B.
 	  This option also supports BCM2837-based variants such as the RPi 3
 	  Model B, when run in 32-bit mode, provided you have configured the
 	  VideoCore firmware to select the PL011 UART for the console by:
 	  a) config.txt should contain dtoverlay=pi3-miniuart-bt.
 	  b) You should run the following to tell the VC FW to process DT when
 	  booting, and copy u-boot.bin.img (rather than u-boot.bin) to the SD
 	  card as the kernel image:
 	       path/to/kernel/scripts/mkknlimg --dtok u-boot.bin u-boot.bin.img
 	  This works as of firmware.git commit 046effa13ebc "firmware:
 	  arm_loader: emmc clock depends on core clock See:
 	  https://github.com/raspberrypi/firmware/issues/572".
 	  This option creates a build targetting the ARMv7/AArch32 ISA.
 	select BCM2836
 config TARGET_RPI_3_32B
 	bool "Raspberry Pi 3 32-bit build"
 	help
 	  Support for all BCM2837-based Raspberry Pi variants, such as
 	  the RPi 3 model B, in AArch32 (32-bit) mode.
 	  This option assumes the VideoCore firmware is configured to use the
 	  mini UART (rather than PL011) for the serial console. This is the
 	  default on the RPi 3. To enable the UART console, the following non-
 	  default option must be present in config.txt: enable_uart=1. This is
 	  required for U-Boot to operate correctly, even if you only care
 	  about the HDMI/usbkbd console.
 	  This option creates a build targetting the ARMv7/AArch32 ISA.
 	select BCM2837_32B
 config TARGET_RPI_3
 	bool "Raspberry Pi 3 64-bit build"
 	help
 	  Support for all BCM2837-based Raspberry Pi variants, such as
 	  the RPi 3 model B, in AArch64 (64-bit) mode.
 	  This option assumes the VideoCore firmware is configured to use the
 	  mini UART (rather than PL011) for the serial console. This is the
 	  default on the RPi 3. To enable the UART console, the following non-
 	  default option must be present in config.txt: enable_uart=1. This is
 	  required for U-Boot to operate correctly, even if you only care
 	  about the HDMI/usbkbd console.
 	  At the time of writing, the VC FW requires a non-default option in
 	  config.txt to request the ARM CPU boot in 64-bit mode:
 	  arm_control=0x200
 	  The VC FW typically provides ARM "stub" code to set up the CPU and
 	  quiesce secondary SMP CPUs. This is not currently true in 64-bit
 	  mode. In order to boot U-Boot before the VC FW is enhanced, please
 	  see the commit description for the commit which added RPi3 support
 	  for a workaround. Since the instructions are temporary, they are not
 	  duplicated here. The VC FW enhancement is tracked in
 	  https://github.com/raspberrypi/firmware/issues/579.
 	  This option creates a build targetting the ARMv8/AArch64 ISA.
 	select BCM2837_64B
 endchoice
 config SYS_BOARD
 	default "rpi"
 config SYS_VENDOR
 	default "raspberrypi"
 config SYS_SOC
 	default "bcm283x"
 config SYS_CONFIG_NAME
 	default "rpi"
 endmenu

board/raspberrypi/rpi/rpi.c

Diff comments View file @ 8993056

 /*
  * (C) Copyright 2012-2016 Stephen Warren
  *
  * SPDX-License-Identifier:	GPL-2.0
  */
 #include <common.h>
 #include <inttypes.h>
 #include <config.h>
 #include <dm.h>
 #include <efi_loader.h>
 #include <fdt_support.h>
 #include <fdt_simplefb.h>
 #include <lcd.h>
 #include <memalign.h>
 #include <mmc.h>
 #include <asm/gpio.h>
 #include <asm/arch/mbox.h>
 #include <asm/arch/msg.h>
 #include <asm/arch/sdhci.h>
 #include <asm/global_data.h>
 #include <dm/platform_data/serial_bcm283x_mu.h>
 #ifdef CONFIG_ARM64
 #include <asm/armv8/mmu.h>
 #endif
 #include <watchdog.h>
 DECLARE_GLOBAL_DATA_PTR;
 /* From lowlevel_init.S */
 extern unsigned long fw_dtb_pointer;
 /* TODO(sjg@chromium.org): Move these to the msg.c file */
 struct msg_get_arm_mem {
 	struct bcm2835_mbox_hdr hdr;
 	struct bcm2835_mbox_tag_get_arm_mem get_arm_mem;
 	u32 end_tag;
 };
 struct msg_get_board_rev {
 	struct bcm2835_mbox_hdr hdr;
 	struct bcm2835_mbox_tag_get_board_rev get_board_rev;
 	u32 end_tag;
 };
 struct msg_get_board_serial {
 	struct bcm2835_mbox_hdr hdr;
 	struct bcm2835_mbox_tag_get_board_serial get_board_serial;
 	u32 end_tag;
 };
 struct msg_get_mac_address {
 	struct bcm2835_mbox_hdr hdr;
 	struct bcm2835_mbox_tag_get_mac_address get_mac_address;
 	u32 end_tag;
 };
 struct msg_get_clock_rate {
 	struct bcm2835_mbox_hdr hdr;
 	struct bcm2835_mbox_tag_get_clock_rate get_clock_rate;
 	u32 end_tag;
 };
 #ifdef CONFIG_ARM64
 #define DTB_DIR "broadcom/"
 #else
 #define DTB_DIR ""
 #endif
 /*
  * http://raspberryalphaomega.org.uk/2013/02/06/automatic-raspberry-pi-board-revision-detection-model-a-b1-and-b2/
  * http://www.raspberrypi.org/forums/viewtopic.php?f=63&t=32733
  * http://git.drogon.net/?p=wiringPi;a=blob;f=wiringPi/wiringPi.c;h=503151f61014418b9c42f4476a6086f75cd4e64b;hb=refs/heads/master#l922
  *
  * In http://lists.denx.de/pipermail/u-boot/2016-January/243752.html
  * ("[U-Boot] [PATCH] rpi: fix up Model B entries") Dom Cobley at the RPi
  * Foundation stated that the following source was accurate:
  * https://github.com/AndrewFromMelbourne/raspberry_pi_revision
  */
 struct rpi_model {
 	const char *name;
 	const char *fdtfile;
 	bool has_onboard_eth;
 };
 static const struct rpi_model rpi_model_unknown = {
 	"Unknown model",
 	DTB_DIR "bcm283x-rpi-other.dtb",
 	false,
 };
 static const struct rpi_model rpi_models_new_scheme[] = {
 	[0x4] = {
 		"2 Model B",
 		DTB_DIR "bcm2836-rpi-2-b.dtb",
 		true,
 	},
 	[0x8] = {
 		"3 Model B",
 		DTB_DIR "bcm2837-rpi-3-b.dtb",
 		true,
 	},
 	[0x9] = {
 		"Zero",
 		DTB_DIR "bcm2835-rpi-zero.dtb",
 		false,
 	},
+	[0xC] = {
+		"Zero W",
+		DTB_DIR "bcm2835-rpi-zero-w.dtb",
+		false,
+	},
 };
 static const struct rpi_model rpi_models_old_scheme[] = {
 	[0x2] = {
 		"Model B",
 		DTB_DIR "bcm2835-rpi-b.dtb",
 		true,
 	},
 	[0x3] = {
 		"Model B",
 		DTB_DIR "bcm2835-rpi-b.dtb",
 		true,
 	},
 	[0x4] = {
 		"Model B rev2",
 		DTB_DIR "bcm2835-rpi-b-rev2.dtb",
 		true,
 	},
 	[0x5] = {
 		"Model B rev2",
 		DTB_DIR "bcm2835-rpi-b-rev2.dtb",
 		true,
 	},
 	[0x6] = {
 		"Model B rev2",
 		DTB_DIR "bcm2835-rpi-b-rev2.dtb",
 		true,
 	},
 	[0x7] = {
 		"Model A",
 		DTB_DIR "bcm2835-rpi-a.dtb",
 		false,
 	},
 	[0x8] = {
 		"Model A",
 		DTB_DIR "bcm2835-rpi-a.dtb",
 		false,
 	},
 	[0x9] = {
 		"Model A",
 		DTB_DIR "bcm2835-rpi-a.dtb",
 		false,
 	},
 	[0xd] = {
 		"Model B rev2",
 		DTB_DIR "bcm2835-rpi-b-rev2.dtb",
 		true,
 	},
 	[0xe] = {
 		"Model B rev2",
 		DTB_DIR "bcm2835-rpi-b-rev2.dtb",
 		true,
 	},
 	[0xf] = {
 		"Model B rev2",
 		DTB_DIR "bcm2835-rpi-b-rev2.dtb",
 		true,
 	},
 	[0x10] = {
 		"Model B+",
 		DTB_DIR "bcm2835-rpi-b-plus.dtb",
 		true,
 	},
 	[0x11] = {
 		"Compute Module",
 		DTB_DIR "bcm2835-rpi-cm.dtb",
 		false,
 	},
 	[0x12] = {
 		"Model A+",
 		DTB_DIR "bcm2835-rpi-a-plus.dtb",
 		false,
 	},
 	[0x13] = {
 		"Model B+",
 		DTB_DIR "bcm2835-rpi-b-plus.dtb",
 		true,
 	},
 	[0x14] = {
 		"Compute Module",
 		DTB_DIR "bcm2835-rpi-cm.dtb",
 		false,
 	},
 	[0x15] = {
 		"Model A+",
 		DTB_DIR "bcm2835-rpi-a-plus.dtb",
 		false,
 	},
 };
 static uint32_t revision;
 static uint32_t rev_scheme;
 static uint32_t rev_type;
 static const struct rpi_model *model;
 #ifdef CONFIG_ARM64
 static struct mm_region bcm2837_mem_map[] = {
 	{
 		.virt = 0x00000000UL,
 		.phys = 0x00000000UL,
 		.size = 0x3f000000UL,
 		.attrs = PTE_BLOCK_MEMTYPE(MT_NORMAL) |
 			 PTE_BLOCK_INNER_SHARE
 	}, {
 		.virt = 0x3f000000UL,
 		.phys = 0x3f000000UL,
 		.size = 0x01000000UL,
 		.attrs = PTE_BLOCK_MEMTYPE(MT_DEVICE_NGNRNE) |
 			 PTE_BLOCK_NON_SHARE |
 			 PTE_BLOCK_PXN | PTE_BLOCK_UXN
 	}, {
 		/* List terminator */
 		0,
 	}
 };
 struct mm_region *mem_map = bcm2837_mem_map;
 #endif
 int dram_init(void)
 {
 	ALLOC_CACHE_ALIGN_BUFFER(struct msg_get_arm_mem, msg, 1);
 	int ret;
 	BCM2835_MBOX_INIT_HDR(msg);
 	BCM2835_MBOX_INIT_TAG(&msg->get_arm_mem, GET_ARM_MEMORY);
 	ret = bcm2835_mbox_call_prop(BCM2835_MBOX_PROP_CHAN, &msg->hdr);
 	if (ret) {
 		printf("bcm2835: Could not query ARM memory size\n");
 		return -1;
 	}
 	gd->ram_size = msg->get_arm_mem.body.resp.mem_size;
 	return 0;
 }
 static void set_fdtfile(void)
 {
 	const char *fdtfile;
 	if (env_get("fdtfile"))
 		return;
 	fdtfile = model->fdtfile;
 	env_set("fdtfile", fdtfile);
 }
 /*
  * If the firmware provided a valid FDT at boot time, let's expose it in
  * ${fdt_addr} so it may be passed unmodified to the kernel.
  */
 static void set_fdt_addr(void)
 {
 	if (env_get("fdt_addr"))
 		return;
 	if (fdt_magic(fw_dtb_pointer) != FDT_MAGIC)
 		return;
 	env_set_hex("fdt_addr", fw_dtb_pointer);
 }
 /*
  * Prevent relocation from stomping on a firmware provided FDT blob.
  */
 unsigned long board_get_usable_ram_top(unsigned long total_size)
 {
 	if ((gd->ram_top - fw_dtb_pointer) > SZ_64M)
 		return gd->ram_top;
 	return fw_dtb_pointer & ~0xffff;
 }
 static void set_usbethaddr(void)
 {
 	ALLOC_CACHE_ALIGN_BUFFER(struct msg_get_mac_address, msg, 1);
 	int ret;
 	if (!model->has_onboard_eth)
 		return;
 	if (env_get("usbethaddr"))
 		return;
 	BCM2835_MBOX_INIT_HDR(msg);
 	BCM2835_MBOX_INIT_TAG(&msg->get_mac_address, GET_MAC_ADDRESS);
 	ret = bcm2835_mbox_call_prop(BCM2835_MBOX_PROP_CHAN, &msg->hdr);
 	if (ret) {
 		printf("bcm2835: Could not query MAC address\n");
 		/* Ignore error; not critical */
 		return;
 	}
 	eth_env_set_enetaddr("usbethaddr", msg->get_mac_address.body.resp.mac);
 	if (!env_get("ethaddr"))
 		env_set("ethaddr", env_get("usbethaddr"));
 	return;
 }
 #ifdef CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG
 static void set_board_info(void)
 {
 	char s[11];
 	snprintf(s, sizeof(s), "0x%X", revision);
 	env_set("board_revision", s);
 	snprintf(s, sizeof(s), "%d", rev_scheme);
 	env_set("board_rev_scheme", s);
 	/* Can't rename this to board_rev_type since it's an ABI for scripts */
 	snprintf(s, sizeof(s), "0x%X", rev_type);
 	env_set("board_rev", s);
 	env_set("board_name", model->name);
 }
 #endif /* CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG */
 static void set_serial_number(void)
 {
 	ALLOC_CACHE_ALIGN_BUFFER(struct msg_get_board_serial, msg, 1);
 	int ret;
 	char serial_string[17] = { 0 };
 	if (env_get("serial#"))
 		return;
 	BCM2835_MBOX_INIT_HDR(msg);
 	BCM2835_MBOX_INIT_TAG_NO_REQ(&msg->get_board_serial, GET_BOARD_SERIAL);
 	ret = bcm2835_mbox_call_prop(BCM2835_MBOX_PROP_CHAN, &msg->hdr);
 	if (ret) {
 		printf("bcm2835: Could not query board serial\n");
 		/* Ignore error; not critical */
 		return;
 	}
 	snprintf(serial_string, sizeof(serial_string), "%016" PRIx64,
 		 msg->get_board_serial.body.resp.serial);
 	env_set("serial#", serial_string);
 }
 int misc_init_r(void)
 {
 	set_fdt_addr();
 	set_fdtfile();
 	set_usbethaddr();
 #ifdef CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG
 	set_board_info();
 #endif
 	set_serial_number();
 	return 0;
 }
 static void get_board_rev(void)
 {
 	ALLOC_CACHE_ALIGN_BUFFER(struct msg_get_board_rev, msg, 1);
 	int ret;
 	const struct rpi_model *models;
 	uint32_t models_count;
 	BCM2835_MBOX_INIT_HDR(msg);
 	BCM2835_MBOX_INIT_TAG(&msg->get_board_rev, GET_BOARD_REV);
 	ret = bcm2835_mbox_call_prop(BCM2835_MBOX_PROP_CHAN, &msg->hdr);
 	if (ret) {
 		printf("bcm2835: Could not query board revision\n");
 		/* Ignore error; not critical */
 		return;
 	}
 	/*
 	 * For details of old-vs-new scheme, see:
 	 * https://github.com/pimoroni/RPi.version/blob/master/RPi/version.py
 	 * http://www.raspberrypi.org/forums/viewtopic.php?f=63&t=99293&p=690282
 	 * (a few posts down)
 	 *
 	 * For the RPi 1, bit 24 is the "warranty bit", so we mask off just the
 	 * lower byte to use as the board rev:
 	 * http://www.raspberrypi.org/forums/viewtopic.php?f=63&t=98367&start=250
 	 * http://www.raspberrypi.org/forums/viewtopic.php?f=31&t=20594
 	 */
 	revision = msg->get_board_rev.body.resp.rev;
 	if (revision & 0x800000) {
 		rev_scheme = 1;
 		rev_type = (revision >> 4) & 0xff;
 		models = rpi_models_new_scheme;
 		models_count = ARRAY_SIZE(rpi_models_new_scheme);
 	} else {
 		rev_scheme = 0;
 		rev_type = revision & 0xff;
 		models = rpi_models_old_scheme;
 		models_count = ARRAY_SIZE(rpi_models_old_scheme);
 	}
 	if (rev_type >= models_count) {
 		printf("RPI: Board rev 0x%x outside known range\n", rev_type);
 		model = &rpi_model_unknown;
 	} else if (!models[rev_type].name) {
 		printf("RPI: Board rev 0x%x unknown\n", rev_type);
 		model = &rpi_model_unknown;
 	} else {
 		model = &models[rev_type];
 	}
 	printf("RPI %s (0x%x)\n", model->name, revision);
 }
 #ifndef CONFIG_PL01X_SERIAL
 static bool rpi_is_serial_active(void)
 {
 	int serial_gpio = 15;
 	struct udevice *dev;
 	/*
 	 * The RPi3 disables the mini uart by default. The easiest way to find
 	 * out whether it is available is to check if the RX pin is muxed.
 	 */
 	if (uclass_first_device(UCLASS_GPIO, &dev) || !dev)
 		return true;
 	if (bcm2835_gpio_get_func_id(dev, serial_gpio) != BCM2835_GPIO_ALT5)
 		return false;
 	return true;
 }
 /* Disable mini-UART I/O if it's not pinmuxed to our pins.
  * The firmware only enables it if explicitly done in config.txt: enable_uart=1
  */
 static void rpi_disable_inactive_uart(void)
 {
 	struct udevice *dev;
 	struct bcm283x_mu_serial_platdata *plat;
 	if (uclass_get_device_by_driver(UCLASS_SERIAL,
 					DM_GET_DRIVER(serial_bcm283x_mu),
 					&dev) || !dev)
 		return;
 	if (!rpi_is_serial_active()) {
 		plat = dev_get_platdata(dev);
 		plat->disabled = true;
 	}
 }
 #endif
 int board_init(void)
 {
 #ifdef CONFIG_HW_WATCHDOG
 	hw_watchdog_init();
 #endif
 #ifndef CONFIG_PL01X_SERIAL
 	rpi_disable_inactive_uart();
 #endif
 	get_board_rev();
 	gd->bd->bi_boot_params = 0x100;
 	return bcm2835_power_on_module(BCM2835_MBOX_POWER_DEVID_USB_HCD);
 }
 /*
  * If the firmware passed a device tree use it for U-Boot.
  */
 void *board_fdt_blob_setup(void)
 {
 	if (fdt_magic(fw_dtb_pointer) != FDT_MAGIC)
 		return NULL;
 	return (void *)fw_dtb_pointer;
 }
 int ft_board_setup(void *blob, bd_t *bd)
 {
 	/*
 	 * For now, we simply always add the simplefb DT node. Later, we
 	 * should be more intelligent, and e.g. only do this if no enabled DT
 	 * node exists for the "real" graphics driver.
 	 */
 	lcd_dt_simplefb_add_node(blob);
 #ifdef CONFIG_EFI_LOADER
 	/* Reserve the spin table */
 	efi_add_memory_map(0, 1, EFI_RESERVED_MEMORY_TYPE, 0);
 #endif
 	return 0;
 }

configs/rpi_0_w_defconfig

Diff comments View file @ 8993056

File was created	1	CONFIG_ARM=y
	2	CONFIG_ARCH_BCM283X=y
	3	CONFIG_TARGET_RPI_0_W=y
	4	CONFIG_DEFAULT_DEVICE_TREE="bcm2835-rpi-zero-w"
	5	CONFIG_DISTRO_DEFAULTS=y
	6	CONFIG_OF_BOARD_SETUP=y
	7	# CONFIG_DISPLAY_CPUINFO is not set
	8	# CONFIG_DISPLAY_BOARDINFO is not set
	9	CONFIG_SYS_PROMPT="U-Boot> "
	10	# CONFIG_CMD_IMLS is not set
	11	# CONFIG_CMD_FLASH is not set
	12	CONFIG_CMD_MMC=y
	13	CONFIG_CMD_USB=y
	14	# CONFIG_CMD_FPGA is not set
	15	CONFIG_CMD_GPIO=y
	16	CONFIG_DM_MMC=y
	17	CONFIG_MMC_SDHCI=y
	18	CONFIG_MMC_SDHCI_BCM2835=y
	19	CONFIG_DM_ETH=y
	20	CONFIG_USB=y
	21	CONFIG_DM_USB=y
	22	CONFIG_USB_STORAGE=y
	23	CONFIG_USB_KEYBOARD=y
	24	CONFIG_DM_VIDEO=y
	25	CONFIG_SYS_WHITE_ON_BLACK=y
	26	CONFIG_CONSOLE_SCROLL_LINES=10
	27	CONFIG_PHYS_TO_BUS=y
	28	CONFIG_OF_LIBFDT_OVERLAY=y
	29

include/configs/rpi.h

Diff comments View file @ 8993056

1	/*	1	/*
2	* (C) Copyright 2012-2016 Stephen Warren	2	* (C) Copyright 2012-2016 Stephen Warren
3	*	3	*
4	* SPDX-License-Identifier: GPL-2.0	4	* SPDX-License-Identifier: GPL-2.0
5	*/	5	*/
6		6
7	#ifndef __CONFIG_H	7	#ifndef __CONFIG_H
8	#define __CONFIG_H	8	#define __CONFIG_H
9		9
10	#include <linux/sizes.h>	10	#include <linux/sizes.h>
11	#include <asm/arch/timer.h>	11	#include <asm/arch/timer.h>
12		12
13	#if defined(CONFIG_TARGET_RPI_2) \|\| defined(CONFIG_TARGET_RPI_3_32B)	13	#if defined(CONFIG_TARGET_RPI_2) \|\| defined(CONFIG_TARGET_RPI_3_32B)
14	#define CONFIG_SKIP_LOWLEVEL_INIT	14	#define CONFIG_SKIP_LOWLEVEL_INIT
15	#endif	15	#endif
16		16
17	/* Architecture, CPU, etc.*/	17	/* Architecture, CPU, etc.*/
18	#define CONFIG_ARCH_CPU_INIT	18	#define CONFIG_ARCH_CPU_INIT
19		19
20	/* Use SoC timer for AArch32, but architected timer for AArch64 */	20	/* Use SoC timer for AArch32, but architected timer for AArch64 */
21	#ifndef CONFIG_ARM64	21	#ifndef CONFIG_ARM64
22	#define CONFIG_SYS_TIMER_RATE 1000000	22	#define CONFIG_SYS_TIMER_RATE 1000000
23	#define CONFIG_SYS_TIMER_COUNTER \	23	#define CONFIG_SYS_TIMER_COUNTER \
24	(&((struct bcm2835_timer_regs *)BCM2835_TIMER_PHYSADDR)->clo)	24	(&((struct bcm2835_timer_regs *)BCM2835_TIMER_PHYSADDR)->clo)
25	#endif	25	#endif
26		26
27	/*	27	/*
28	* 2835 is a SKU in a series for which the 2708 is the first or primary SoC,	28	* 2835 is a SKU in a series for which the 2708 is the first or primary SoC,
29	* so 2708 has historically been used rather than a dedicated 2835 ID.	29	* so 2708 has historically been used rather than a dedicated 2835 ID.
30	*	30	*
31	* We don't define a machine type for bcm2709/bcm2836 since the RPi Foundation	31	* We don't define a machine type for bcm2709/bcm2836 since the RPi Foundation
32	* chose to use someone else's previously registered machine ID (3139, MX51_GGC)	32	* chose to use someone else's previously registered machine ID (3139, MX51_GGC)
33	* rather than obtaining a valid ID:-/	33	* rather than obtaining a valid ID:-/
34	*	34	*
35	* For the bcm2837, hopefully a machine type is not needed, since everything	35	* For the bcm2837, hopefully a machine type is not needed, since everything
36	* is DT.	36	* is DT.
37	*/	37	*/
38	#ifdef CONFIG_BCM2835	38	#ifdef CONFIG_BCM2835
39	#define CONFIG_MACH_TYPE MACH_TYPE_BCM2708	39	#define CONFIG_MACH_TYPE MACH_TYPE_BCM2708
40	#endif	40	#endif
41		41
42	/* Memory layout */	42	/* Memory layout */
43	#define CONFIG_NR_DRAM_BANKS 1	43	#define CONFIG_NR_DRAM_BANKS 1
44	#define CONFIG_SYS_SDRAM_BASE 0x00000000	44	#define CONFIG_SYS_SDRAM_BASE 0x00000000
45	#ifdef CONFIG_ARM64	45	#ifdef CONFIG_ARM64
46	#define CONFIG_SYS_TEXT_BASE 0x00080000	46	#define CONFIG_SYS_TEXT_BASE 0x00080000
47	#else	47	#else
48	#define CONFIG_SYS_TEXT_BASE 0x00008000	48	#define CONFIG_SYS_TEXT_BASE 0x00008000
49	#endif	49	#endif
50	#define CONFIG_SYS_UBOOT_BASE CONFIG_SYS_TEXT_BASE	50	#define CONFIG_SYS_UBOOT_BASE CONFIG_SYS_TEXT_BASE
51	/*	51	/*
52	* The board really has 256M. However, the VC (VideoCore co-processor) shares	52	* The board really has 256M. However, the VC (VideoCore co-processor) shares
53	* the RAM, and uses a configurable portion at the top. We tell U-Boot that a	53	* the RAM, and uses a configurable portion at the top. We tell U-Boot that a
54	* smaller amount of RAM is present in order to avoid stomping on the area	54	* smaller amount of RAM is present in order to avoid stomping on the area
55	* the VC uses.	55	* the VC uses.
56	*/	56	*/
57	#define CONFIG_SYS_SDRAM_SIZE SZ_128M	57	#define CONFIG_SYS_SDRAM_SIZE SZ_128M
58	#define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_SDRAM_BASE + \	58	#define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_SDRAM_BASE + \
59	CONFIG_SYS_SDRAM_SIZE - \	59	CONFIG_SYS_SDRAM_SIZE - \
60	GENERATED_GBL_DATA_SIZE)	60	GENERATED_GBL_DATA_SIZE)
61	#define CONFIG_SYS_MALLOC_LEN SZ_4M	61	#define CONFIG_SYS_MALLOC_LEN SZ_4M
62	#define CONFIG_SYS_MEMTEST_START 0x00100000	62	#define CONFIG_SYS_MEMTEST_START 0x00100000
63	#define CONFIG_SYS_MEMTEST_END 0x00200000	63	#define CONFIG_SYS_MEMTEST_END 0x00200000
64	#define CONFIG_LOADADDR 0x00200000	64	#define CONFIG_LOADADDR 0x00200000
65		65
66	/* Devices */	66	/* Devices */
67	/* GPIO */	67	/* GPIO */
68	#define CONFIG_BCM2835_GPIO	68	#define CONFIG_BCM2835_GPIO
69	/* LCD */	69	/* LCD */
70	#define CONFIG_LCD_DT_SIMPLEFB	70	#define CONFIG_LCD_DT_SIMPLEFB
71	#define CONFIG_VIDEO_BCM2835	71	#define CONFIG_VIDEO_BCM2835
72		72
73	#ifdef CONFIG_CMD_USB	73	#ifdef CONFIG_CMD_USB
74	#define CONFIG_TFTP_TSIZE	74	#define CONFIG_TFTP_TSIZE
75	#define CONFIG_MISC_INIT_R	75	#define CONFIG_MISC_INIT_R
76	#endif	76	#endif
77		77
78	/* Console UART */	78	/* Console UART */
79	#ifdef CONFIG_BCM2837	79	#if defined (CONFIG_BCM2837) \|\| defined(CONFIG_TARGET_RPI_0_W)
80	#define CONFIG_BCM283X_MU_SERIAL	80	#define CONFIG_BCM283X_MU_SERIAL
81	#else	81	#else
82	#define CONFIG_PL01X_SERIAL	82	#define CONFIG_PL01X_SERIAL
83	#endif	83	#endif
84		84
85	/* Console configuration */	85	/* Console configuration */
86	#define CONFIG_SYS_CBSIZE 1024	86	#define CONFIG_SYS_CBSIZE 1024
87		87
88	/* Environment */	88	/* Environment */
89	#define CONFIG_ENV_SIZE SZ_16K	89	#define CONFIG_ENV_SIZE SZ_16K
90	#define CONFIG_ENV_VARS_UBOOT_CONFIG	90	#define CONFIG_ENV_VARS_UBOOT_CONFIG
91	#define CONFIG_SYS_LOAD_ADDR 0x1000000	91	#define CONFIG_SYS_LOAD_ADDR 0x1000000
92	#define CONFIG_PREBOOT "usb start"	92	#define CONFIG_PREBOOT "usb start"
93		93
94	/* Shell */	94	/* Shell */
95	#define CONFIG_CMDLINE_EDITING	95	#define CONFIG_CMDLINE_EDITING
96		96
97	/* ATAGs support for bootm/bootz */	97	/* ATAGs support for bootm/bootz */
98	#define CONFIG_SETUP_MEMORY_TAGS	98	#define CONFIG_SETUP_MEMORY_TAGS
99	#define CONFIG_CMDLINE_TAG	99	#define CONFIG_CMDLINE_TAG
100	#define CONFIG_INITRD_TAG	100	#define CONFIG_INITRD_TAG
101		101
102	#include <config_distro_defaults.h>	102	#include <config_distro_defaults.h>
103		103
104	/* Environment */	104	/* Environment */
105	#define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG	105	#define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG
106	#define ENV_DEVICE_SETTINGS \	106	#define ENV_DEVICE_SETTINGS \
107	"stdin=serial,usbkbd\0" \	107	"stdin=serial,usbkbd\0" \
108	"stdout=serial,vidconsole\0" \	108	"stdout=serial,vidconsole\0" \
109	"stderr=serial,vidconsole\0"	109	"stderr=serial,vidconsole\0"
110		110
111	/*	111	/*
112	* Memory layout for where various images get loaded by boot scripts:	112	* Memory layout for where various images get loaded by boot scripts:
113	*	113	*
114	* I suspect address 0 is used as the SMP pen on the RPi2, so avoid this.	114	* I suspect address 0 is used as the SMP pen on the RPi2, so avoid this.
115	*	115	*
116	* fdt_addr_r simply shouldn't overlap anything else. However, the RPi's	116	* fdt_addr_r simply shouldn't overlap anything else. However, the RPi's
117	* binary firmware loads a DT to address 0x100, so we choose this address to	117	* binary firmware loads a DT to address 0x100, so we choose this address to
118	* match it. This allows custom boot scripts to pass this DT on to Linux	118	* match it. This allows custom boot scripts to pass this DT on to Linux
119	* simply by not over-writing the data at this address. When using U-Boot,	119	* simply by not over-writing the data at this address. When using U-Boot,
120	* U-Boot (and scripts it executes) typicaly ignore the DT loaded by the FW	120	* U-Boot (and scripts it executes) typicaly ignore the DT loaded by the FW
121	* and loads its own DT from disk (triggered by boot.scr or extlinux.conf).	121	* and loads its own DT from disk (triggered by boot.scr or extlinux.conf).
122	*	122	*
123	* pxefile_addr_r can be pretty much anywhere that doesn't conflict with	123	* pxefile_addr_r can be pretty much anywhere that doesn't conflict with
124	* something else. Put it low in memory to avoid conflicts.	124	* something else. Put it low in memory to avoid conflicts.
125	*	125	*
126	* kernel_addr_r must be within the first 128M of RAM in order for the	126	* kernel_addr_r must be within the first 128M of RAM in order for the
127	* kernel's CONFIG_AUTO_ZRELADDR option to work. Since the kernel will	127	* kernel's CONFIG_AUTO_ZRELADDR option to work. Since the kernel will
128	* decompress itself to 0x8000 after the start of RAM, kernel_addr_r	128	* decompress itself to 0x8000 after the start of RAM, kernel_addr_r
129	* should not overlap that area, or the kernel will have to copy itself	129	* should not overlap that area, or the kernel will have to copy itself
130	* somewhere else before decompression. Similarly, the address of any other	130	* somewhere else before decompression. Similarly, the address of any other
131	* data passed to the kernel shouldn't overlap the start of RAM. Pushing	131	* data passed to the kernel shouldn't overlap the start of RAM. Pushing
132	* this up to 16M allows for a sizable kernel to be decompressed below the	132	* this up to 16M allows for a sizable kernel to be decompressed below the
133	* compressed load address.	133	* compressed load address.
134	*	134	*
135	* scriptaddr can be pretty much anywhere that doesn't conflict with something	135	* scriptaddr can be pretty much anywhere that doesn't conflict with something
136	* else. Choosing 32M allows for the compressed kernel to be up to 16M.	136	* else. Choosing 32M allows for the compressed kernel to be up to 16M.
137	*	137	*
138	* ramdisk_addr_r simply shouldn't overlap anything else. Choosing 33M allows	138	* ramdisk_addr_r simply shouldn't overlap anything else. Choosing 33M allows
139	* for any boot script to be up to 1M, which is hopefully plenty.	139	* for any boot script to be up to 1M, which is hopefully plenty.
140	*/	140	*/
141	#define ENV_MEM_LAYOUT_SETTINGS \	141	#define ENV_MEM_LAYOUT_SETTINGS \
142	"fdt_high=ffffffff\0" \	142	"fdt_high=ffffffff\0" \
143	"initrd_high=ffffffff\0" \	143	"initrd_high=ffffffff\0" \
144	"fdt_addr_r=0x00000100\0" \	144	"fdt_addr_r=0x00000100\0" \
145	"pxefile_addr_r=0x00100000\0" \	145	"pxefile_addr_r=0x00100000\0" \
146	"kernel_addr_r=0x01000000\0" \	146	"kernel_addr_r=0x01000000\0" \
147	"scriptaddr=0x02000000\0" \	147	"scriptaddr=0x02000000\0" \
148	"ramdisk_addr_r=0x02100000\0" \	148	"ramdisk_addr_r=0x02100000\0" \
149		149
150	#define BOOT_TARGET_DEVICES(func) \	150	#define BOOT_TARGET_DEVICES(func) \
151	func(MMC, mmc, 0) \	151	func(MMC, mmc, 0) \
152	func(USB, usb, 0) \	152	func(USB, usb, 0) \
153	func(PXE, pxe, na) \	153	func(PXE, pxe, na) \
154	func(DHCP, dhcp, na)	154	func(DHCP, dhcp, na)
155	#include <config_distro_bootcmd.h>	155	#include <config_distro_bootcmd.h>
156		156
157	#define CONFIG_EXTRA_ENV_SETTINGS \	157	#define CONFIG_EXTRA_ENV_SETTINGS \
158	"dhcpuboot=usb start; dhcp u-boot.uimg; bootm\0" \	158	"dhcpuboot=usb start; dhcp u-boot.uimg; bootm\0" \
159	ENV_DEVICE_SETTINGS \	159	ENV_DEVICE_SETTINGS \
160	ENV_MEM_LAYOUT_SETTINGS \	160	ENV_MEM_LAYOUT_SETTINGS \
161	BOOTENV	161	BOOTENV
162		162
163		163
164	#endif	164	#endif
165		165