diff --git a/bsp/buildroot_external/Config.in b/bsp/buildroot_external/Config.in index cee9ecef..93f63835 100644 --- a/bsp/buildroot_external/Config.in +++ b/bsp/buildroot_external/Config.in @@ -7,10 +7,10 @@ menu "Third parties" #source "$BR2_EXTERNAL_DOMO_PATH/package/netifd/Config.in" # PROCD -#source "$BR2_EXTERNAL_DOMO_PATH/package/procd/Config.in" +source "$BR2_EXTERNAL_DOMO_PATH/package/procd/Config.in" # UBOX -#source "$BR2_EXTERNAL_DOMO_PATH/package/ubox/Config.in" +source "$BR2_EXTERNAL_DOMO_PATH/package/ubox/Config.in" # UBUS #source "$BR2_EXTERNAL_DOMO_PATH/package/ubus/Config.in" diff --git a/bsp/buildroot_external/package/ubox/ubox.mk b/bsp/buildroot_external/package/ubox/ubox.mk index 8d0958e8..164296b5 100644 --- a/bsp/buildroot_external/package/ubox/ubox.mk +++ b/bsp/buildroot_external/package/ubox/ubox.mk @@ -6,7 +6,7 @@ UBOX_VERSION:= 2016.07.19 -UBOX_SITE = $(TOPDIR)/../../src/3P/ubox +UBOX_SITE = $(TOPDIR)/../../src/3P/ubox/builders/cmake UBOX_SITE_METHOD = local UBOX_INSTALL_STAGING = YES diff --git a/bsp/include/dtb.mk b/bsp/include/dtb.mk index 2c9c6001..17992944 100644 --- a/bsp/include/dtb.mk +++ b/bsp/include/dtb.mk @@ -1,9 +1,9 @@ dtb: @echo "making device tree ...." - mkdir -p $(AW_STAGING)/dtb/ - mkdir -p $(AW_STAGING)/buildroot/images/ - $(AW_STAGING)/cross/usr/bin/fdtdump $(AW_STAGING)/buildroot/build/rpi-firmware-*/boot/$(DTB_BASE).dtb > $(AW_STAGING)/dtb/$(DTB_BASE).dts - cat $(AW_STAGING)/dtb/$(DTB_BASE).dts | tail -n +2 > $(AW_STAGING)/dtb/$(DTB_BASE).dti - cp dts/*.dt* $(AW_STAGING)/dtb/ - $(AW_STAGING)/cross/usr/bin/dtc -O dtb -o $(AW_STAGING)/buildroot/images/$(AW_PROJECT_NAME).dtb -i $(AW_STAGING)/dtb/ $(AW_STAGING)/dtb/$(AW_PROJECT_NAME).dts + mkdir -p $(BR_STAGING)/dtb/ + mkdir -p $(BR_STAGING)/buildroot/images/ + $(BR_STAGING)/cross/usr/bin/fdtdump $(BR_STAGING)/buildroot/build/rpi-firmware-*/boot/$(DTB_BASE).dtb > $(BR_STAGING)/dtb/$(DTB_BASE).dts + cat $(BR_STAGING)/dtb/$(DTB_BASE).dts | tail -n +2 > $(BR_STAGING)/dtb/$(DTB_BASE).dti + cp dts/*.dt* $(BR_STAGING)/dtb/ + $(BR_STAGING)/cross/usr/bin/dtc -O dtb -o $(BR_STAGING)/buildroot/images/$(BR_PROJECT_NAME).dtb -i $(BR_STAGING)/dtb/ $(BR_STAGING)/dtb/$(BR_PROJECT_NAME).dts diff --git a/projects/rpi_domo/Makefile b/projects/rpi_domo/Makefile index 5ff78761..18c63800 100644 --- a/projects/rpi_domo/Makefile +++ b/projects/rpi_domo/Makefile @@ -4,6 +4,7 @@ # Define the target. export BR_PROJECT:=$(shell pwd) export BR_PROJECT_NAME:=rpi_domo +export DTB_BASE:=bcm2708-rpi-b-plus export BR_BOARD:=$(shell pwd)/../../bsp/board/domo/ diff --git a/projects/rpi_domo/configs/buildroot.config b/projects/rpi_domo/configs/buildroot.config index c9e49299..886b14cf 100644 --- a/projects/rpi_domo/configs/buildroot.config +++ b/projects/rpi_domo/configs/buildroot.config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Buildroot 2017.02-g9088cf6-dirty Configuration +# Buildroot 2017.02-g9e2c90e-dirty Configuration # BR2_HAVE_DOT_CONFIG=y BR2_HOST_GCC_AT_LEAST_4_5=y @@ -143,7 +143,7 @@ BR2_SSP_NONE=y BR2_SHARED_LIBS=y # BR2_SHARED_STATIC_LIBS is not set BR2_PACKAGE_OVERRIDE_FILE="$(BOARD)/local.mk" -BR2_GLOBAL_PATCH_DIR="" +BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL)/patches" # # Advanced @@ -307,15 +307,15 @@ BR2_TARGET_GENERIC_PASSWD_MD5=y # BR2_TARGET_GENERIC_PASSWD_SHA256 is not set # BR2_TARGET_GENERIC_PASSWD_SHA512 is not set BR2_TARGET_GENERIC_PASSWD_METHOD="md5" -BR2_INIT_BUSYBOX=y +# BR2_INIT_BUSYBOX is not set # BR2_INIT_SYSV is not set # BR2_INIT_SYSTEMD is not set -# BR2_INIT_NONE is not set +BR2_INIT_NONE=y # BR2_ROOTFS_DEVICE_CREATION_STATIC is not set BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_DEVTMPFS=y # BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV is not set # BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV is not set -BR2_ROOTFS_DEVICE_TABLE="system/device_table.txt" +BR2_ROOTFS_DEVICE_TABLE="" # BR2_ROOTFS_DEVICE_TABLE_SUPPORTS_EXTENDED_ATTRIBUTES is not set BR2_TARGET_ENABLE_ROOT_LOGIN=y BR2_TARGET_GENERIC_ROOT_PASSWD="" @@ -335,7 +335,7 @@ BR2_TARGET_GENERIC_GETTY_BAUDRATE_KEEP=y # BR2_TARGET_GENERIC_GETTY_BAUDRATE_57600 is not set # BR2_TARGET_GENERIC_GETTY_BAUDRATE_115200 is not set BR2_TARGET_GENERIC_GETTY_BAUDRATE="0" -BR2_TARGET_GENERIC_GETTY_TERM="vt100" +BR2_TARGET_GENERIC_GETTY_TERM="vt102" BR2_TARGET_GENERIC_GETTY_OPTIONS="" # BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW is not set BR2_SYSTEM_DHCP="eth0" @@ -361,8 +361,8 @@ BR2_LINUX_KERNEL_CUSTOM_GIT=y # BR2_LINUX_KERNEL_CUSTOM_HG is not set # BR2_LINUX_KERNEL_CUSTOM_SVN is not set BR2_LINUX_KERNEL_CUSTOM_REPO_URL="ssh://git@serveur.nadal-fr.com:5023/PI/linux.git" -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="c39a262aaf850dabf3c5db720510088225a00999" -BR2_LINUX_KERNEL_VERSION="c39a262aaf850dabf3c5db720510088225a00999" +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="tags/4_4_43" +BR2_LINUX_KERNEL_VERSION="tags/4_4_43" BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL)/patches/linux/rpi" # BR2_LINUX_KERNEL_USE_DEFCONFIG is not set # BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG is not set @@ -594,7 +594,9 @@ BR2_PACKAGE_CMAKE_ARCH_SUPPORTS=y # BR2_PACKAGE_MTD is not set # BR2_PACKAGE_MTOOLS is not set # BR2_PACKAGE_NFS_UTILS is not set -# BR2_PACKAGE_NTFS_3G is not set +BR2_PACKAGE_NTFS_3G=y +# BR2_PACKAGE_NTFS_3G_ENCRYPTED is not set +# BR2_PACKAGE_NTFS_3G_NTFSPROGS is not set # BR2_PACKAGE_SIMICSFS is not set # BR2_PACKAGE_SP_OOPS_EXTRACT is not set # BR2_PACKAGE_SQUASHFS is not set @@ -1386,6 +1388,7 @@ BR2_PACKAGE_LIBNL=y # BR2_PACKAGE_MONGOOSE is not set # BR2_PACKAGE_NEON is not set # BR2_PACKAGE_NORM is not set +# BR2_PACKAGE_NSS_MDNS is not set # BR2_PACKAGE_NSS_PAM_LDAPD is not set # BR2_PACKAGE_OMNIORB is not set # BR2_PACKAGE_OPENLDAP is not set @@ -1454,7 +1457,7 @@ BR2_PACKAGE_LIBBSD_ARCH_SUPPORTS=y # BR2_PACKAGE_LIBCOFI is not set # BR2_PACKAGE_LIBCROCO is not set # BR2_PACKAGE_LIBCROSSGUID is not set -# BR2_PACKAGE_LIBDAEMON is not set +BR2_PACKAGE_LIBDAEMON=y # BR2_PACKAGE_LIBEE is not set # BR2_PACKAGE_LIBEV is not set # BR2_PACKAGE_LIBEVDEV is not set @@ -1587,7 +1590,10 @@ BR2_PACKAGE_QEMU_ARCH_SUPPORTS_TARGET=y # BR2_PACKAGE_ARGUS is not set # BR2_PACKAGE_ARPTABLES is not set # BR2_PACKAGE_ATFTP is not set -# BR2_PACKAGE_AVAHI is not set +BR2_PACKAGE_AVAHI=y +BR2_PACKAGE_AVAHI_AUTOIPD=y +BR2_PACKAGE_AVAHI_DAEMON=y +# BR2_PACKAGE_AVAHI_LIBDNSSD_COMPATIBILITY is not set # BR2_PACKAGE_AXEL is not set # BR2_PACKAGE_BABELD is not set # BR2_PACKAGE_BANDWIDTHD is not set @@ -1912,7 +1918,6 @@ BR2_PACKAGE_EFIVAR_ARCH_SUPPORTS=y # BR2_PACKAGE_FTOP is not set # BR2_PACKAGE_GETENT is not set # BR2_PACKAGE_HTOP is not set -BR2_PACKAGE_INITSCRIPTS=y # # iotop depends on python or python3 @@ -2468,13 +2473,17 @@ BR2_LINUX_KERNEL_CUSTOM_GIT_VERSION="" # # -# Domo br2-external tree (in /home/jbnadal/sources/PI/domo/bsp/buildroot_external) +# Domo br2-external tree (in /home/jbnadal/sources/jb/PI/domo/bsp/buildroot_external) # -BR2_EXTERNAL_DOMO_PATH="/home/jbnadal/sources/PI/domo/bsp/buildroot_external" +BR2_EXTERNAL_DOMO_PATH="/home/jbnadal/sources/jb/PI/domo/bsp/buildroot_external" # # Third parties # +BR2_PACKAGE_PROCD=y +# BR2_PACKAGE_PROCD_DISABLE_INIT is not set +BR2_PACKAGE_PROCD_EARLY_PATH="/usr/sbin:/sbin:/usr/bin:/bin:/usr/local/bin" +# BR2_PACKAGE_UBOX is not set # # Domo diff --git a/projects/rpi_domo/configs/genimage.config b/projects/rpi_domo/configs/genimage.config index 45ea6f80..283364de 100644 --- a/projects/rpi_domo/configs/genimage.config +++ b/projects/rpi_domo/configs/genimage.config @@ -9,7 +9,7 @@ image boot.vfat { "config.txt", "dev.scr", "rpi-firmware/fixup.dat", - "pi_Domo.dtb", + "rpi_domo.dtb", "rootfs.cpio.uboot", "rpi-firmware/start.elf", "u-boot.bin", diff --git a/projects/rpi_domo/dts/bcm2708-rpi-b-plus.dtb b/projects/rpi_domo/dts/bcm2708-rpi-b-plus.dtb deleted file mode 100644 index 629ad430..00000000 Binary files a/projects/rpi_domo/dts/bcm2708-rpi-b-plus.dtb and /dev/null differ diff --git a/projects/rpi_domo/dts/bcm2708-rpi-b-plus.dti b/projects/rpi_domo/dts/bcm2708-rpi-b-plus.dti deleted file mode 100644 index 78184ae0..00000000 --- a/projects/rpi_domo/dts/bcm2708-rpi-b-plus.dti +++ /dev/null @@ -1,523 +0,0 @@ - -/ { - #address-cells = <0x00000001>; - #size-cells = <0x00000001>; - interrupt-parent = <0x00000001>; - compatible = "brcm,bcm2708"; - model = "Raspberry Pi Model B+"; - chosen { - bootargs = [00]; - }; - aliases { - audio = "/soc/audio"; - aux = "/soc/aux@0x7e215004"; - sound = "/soc/sound"; - soc = "/soc"; - dma = "/soc/dma@7e007000"; - intc = "/soc/interrupt-controller@7e00b200"; - watchdog = "/soc/watchdog@7e100000"; - random = "/soc/rng@7e104000"; - mailbox = "/soc/mailbox@7e00b800"; - gpio = "/soc/gpio@7e200000"; - uart0 = "/soc/uart@7e201000"; - sdhost = "/soc/sdhost@7e202000"; - i2s = "/soc/i2s@7e203000"; - spi0 = "/soc/spi@7e204000"; - i2c0 = "/soc/i2c@7e205000"; - uart1 = "/soc/uart@7e215040"; - spi1 = "/soc/spi@7e215080"; - spi2 = "/soc/spi@7e2150C0"; - mmc = "/soc/mmc@7e300000"; - i2c1 = "/soc/i2c@7e804000"; - i2c2 = "/soc/i2c@7e805000"; - usb = "/soc/usb@7e980000"; - leds = "/soc/leds"; - fb = "/soc/fb"; - vchiq = "/soc/vchiq"; - thermal = "/soc/thermal"; - clocks = "/clocks"; - }; - memory { - device_type = "memory"; - reg = <0x00000000 0x00000000>; - }; - soc { - compatible = "simple-bus"; - #address-cells = <0x00000001>; - #size-cells = <0x00000001>; - ranges = <0x7e000000 0x20000000 0x01000000>; - phandle = <0x00000022>; - dma@7e007000 { - compatible = "brcm,bcm2835-dma"; - reg = <0x7e007000 0x00000f00>; - interrupts = <0x00000001 0x00000010 0x00000001 0x00000011 0x00000001 0x00000012 0x00000001 0x00000013 0x00000001 0x00000014 0x00000001 0x00000015 0x00000001 0x00000016 0x00000001 0x00000017 0x00000001 0x00000018 0x00000001 0x00000019 0x00000001 0x0000001a 0x00000001 0x0000001b>; - #dma-cells = <0x00000001>; - brcm,dma-channel-mask = <0x00000f35>; - phandle = <0x00000006>; - }; - interrupt-controller@7e00b200 { - compatible = "brcm,bcm2835-armctrl-ic"; - reg = <0x7e00b200 0x00000200>; - interrupt-controller; - #interrupt-cells = <0x00000002>; - phandle = <0x00000001>; - }; - mailbox@7e00b800 { - compatible = "brcm,bcm2835-mbox"; - reg = <0x7e00b880 0x00000040>; - interrupts = <0x00000000 0x00000001>; - #mbox-cells = <0x00000000>; - phandle = <0x00000012>; - }; - watchdog@7e100000 { - compatible = "brcm,bcm2835-pm-wdt"; - reg = <0x7e100000 0x00000028>; - status = "okay"; - phandle = <0x0000001f>; - }; - cprman@7e101000 { - compatible = "brcm,bcm2835-cprman"; - #clock-cells = <0x00000001>; - reg = <0x7e101000 0x00002000>; - clocks = <0x00000002>; - status = "disabled"; - phandle = <0x00000023>; - }; - rng@7e104000 { - compatible = "brcm,bcm2835-rng"; - reg = <0x7e104000 0x00000010>; - status = "okay"; - phandle = <0x00000020>; - }; - gpio@7e200000 { - compatible = "brcm,bcm2835-gpio"; - reg = <0x7e200000 0x000000b4>; - interrupts = <0x00000002 0x00000011 0x00000002 0x00000012>; - gpio-controller; - #gpio-cells = <0x00000002>; - interrupt-controller; - #interrupt-cells = <0x00000002>; - phandle = <0x00000009>; - sdhost_pins { - brcm,pins = <0x00000030 0x00000031 0x00000032 0x00000033 0x00000034 0x00000035>; - brcm,function = <0x00000004>; - phandle = <0x00000007>; - }; - spi0_pins { - brcm,pins = <0x00000009 0x0000000a 0x0000000b>; - brcm,function = <0x00000004>; - phandle = <0x0000000a>; - }; - spi0_cs_pins { - brcm,pins = <0x00000008 0x00000007>; - brcm,function = <0x00000001>; - phandle = <0x0000000b>; - }; - i2c0 { - brcm,pins = <0x00000000 0x00000001>; - brcm,function = <0x00000004>; - phandle = <0x0000000c>; - }; - i2c1 { - brcm,pins = <0x00000002 0x00000003>; - brcm,function = <0x00000004>; - phandle = <0x00000011>; - }; - i2s { - brcm,pins = <0x00000012 0x00000013 0x00000014 0x00000015>; - brcm,function = <0x00000004>; - phandle = <0x00000008>; - }; - }; - uart@7e201000 { - compatible = "arm,pl011", "arm,primecell"; - reg = <0x7e201000 0x00001000>; - interrupts = <0x00000002 0x00000019>; - clocks = <0x00000003 0x00000004>; - clock-names = "uartclk", "apb_pclk"; - arm,primecell-periphid = <0x00241011>; - status = "okay"; - phandle = <0x00000015>; - }; - sdhost@7e202000 { - compatible = "brcm,bcm2835-sdhost"; - reg = <0x7e202000 0x00000100>; - interrupts = <0x00000002 0x00000018>; - clocks = <0x00000005>; - dmas = <0x00000006 0x0000000d>; - dma-names = "rx-tx"; - brcm,overclock-50 = <0x00000000>; - brcm,pio-limit = <0x00000001>; - status = "okay"; - pinctrl-names = "default"; - pinctrl-0 = <0x00000007>; - bus-width = <0x00000004>; - phandle = <0x00000021>; - }; - i2s@7e203000 { - compatible = "brcm,bcm2835-i2s"; - reg = <0x7e203000 0x00000024 0x7e101098 0x00000008>; - dmas = <0x00000006 0x00000002 0x00000006 0x00000003>; - dma-names = "tx", "rx"; - status = "disabled"; - #sound-dai-cells = <0x00000000>; - pinctrl-names = "default"; - pinctrl-0 = <0x00000008>; - phandle = <0x00000017>; - }; - spi@7e204000 { - compatible = "brcm,bcm2835-spi"; - reg = <0x7e204000 0x00001000>; - interrupts = <0x00000002 0x00000016>; - clocks = <0x00000005>; - #address-cells = <0x00000001>; - #size-cells = <0x00000000>; - status = "disabled"; - dmas = <0x00000006 0x00000006 0x00000006 0x00000007>; - dma-names = "tx", "rx"; - cs-gpios = <0x00000009 0x00000008 0x00000001 0x00000009 0x00000007 0x00000001>; - pinctrl-names = "default"; - pinctrl-0 = <0x0000000a 0x0000000b>; - phandle = <0x00000018>; - spidev@0 { - compatible = "spidev"; - reg = <0x00000000>; - #address-cells = <0x00000001>; - #size-cells = <0x00000000>; - spi-max-frequency = <0x0007a120>; - phandle = <0x00000024>; - }; - spidev@1 { - compatible = "spidev"; - reg = <0x00000001>; - #address-cells = <0x00000001>; - #size-cells = <0x00000000>; - spi-max-frequency = <0x0007a120>; - phandle = <0x00000025>; - }; - }; - i2c@7e205000 { - compatible = "brcm,bcm2708-i2c"; - reg = <0x7e205000 0x00001000>; - interrupts = <0x00000002 0x00000015>; - clocks = <0x00000005>; - #address-cells = <0x00000001>; - #size-cells = <0x00000000>; - status = "disabled"; - pinctrl-names = "default"; - pinctrl-0 = <0x0000000c>; - clock-frequency = <0x000186a0>; - phandle = <0x00000019>; - }; - pwm@7e20c000 { - compatible = "brcm,bcm2835-pwm"; - reg = <0x7e20c000 0x00000028>; - clocks = <0x0000000d>; - #pwm-cells = <0x00000002>; - status = "disabled"; - phandle = <0x00000026>; - }; - aux@0x7e215004 { - compatible = "brcm,bcm2835-aux"; - #clock-cells = <0x00000001>; - reg = <0x7e215000 0x00000008>; - clocks = <0x00000005>; - status = "disabled"; - phandle = <0x0000000f>; - }; - uart@7e215040 { - compatible = "brcm,bcm2835-aux-uart", "ns16550"; - reg = <0x7e215040 0x00000040>; - interrupts = <0x00000001 0x0000001d>; - clocks = <0x0000000e>; - reg-shift = <0x00000002>; - no-loopback-test; - status = "disabled"; - phandle = <0x00000016>; - }; - spi@7e215080 { - compatible = "brcm,bcm2835-aux-spi"; - reg = <0x7e215080 0x00000040 0x7e215000 0x00000008>; - interrupts = <0x00000001 0x0000001d>; - clocks = <0x0000000f 0x00000001>; - #address-cells = <0x00000001>; - #size-cells = <0x00000000>; - status = "disabled"; - phandle = <0x00000027>; - }; - spi@7e2150C0 { - compatible = "brcm,bcm2835-aux-spi"; - reg = <0x7e2150c0 0x00000040 0x7e215000 0x00000008>; - interrupts = <0x00000001 0x0000001d>; - clocks = <0x0000000f 0x00000002>; - #address-cells = <0x00000001>; - #size-cells = <0x00000000>; - status = "disabled"; - phandle = <0x00000028>; - }; - mmc@7e300000 { - compatible = "brcm,bcm2835-mmc"; - reg = <0x7e300000 0x00000100>; - interrupts = <0x00000002 0x0000001e>; - clocks = <0x00000010>; - dmas = <0x00000006 0x0000000b>; - dma-names = "rx-tx"; - brcm,overclock-50 = <0x00000000>; - status = "disabled"; - phandle = <0x00000029>; - }; - i2c@7e804000 { - compatible = "brcm,bcm2708-i2c"; - reg = <0x7e804000 0x00001000>; - interrupts = <0x00000002 0x00000015>; - clocks = <0x00000005>; - #address-cells = <0x00000001>; - #size-cells = <0x00000000>; - status = "disabled"; - pinctrl-names = "default"; - pinctrl-0 = <0x00000011>; - clock-frequency = <0x000186a0>; - phandle = <0x0000001a>; - }; - i2c@7e805000 { - compatible = "brcm,bcm2708-i2c"; - reg = <0x7e805000 0x00001000>; - interrupts = <0x00000002 0x00000015>; - clocks = <0x00000005>; - #address-cells = <0x00000001>; - #size-cells = <0x00000000>; - status = "disabled"; - clock-frequency = <0x000186a0>; - phandle = <0x0000001b>; - }; - smi@7e600000 { - compatible = "brcm,bcm2835-smi"; - reg = <0x7e600000 0x00000044 0x7e1010b0 0x00000008>; - interrupts = <0x00000002 0x00000010>; - brcm,smi-clock-source = <0x00000006>; - brcm,smi-clock-divisor = <0x00000004>; - dmas = <0x00000006 0x00000004>; - dma-names = "rx-tx"; - status = "disabled"; - phandle = <0x0000002a>; - }; - usb@7e980000 { - compatible = "brcm,bcm2708-usb"; - reg = <0x7e980000 0x00010000 0x7e006000 0x00001000>; - interrupts = <0x00000002 0x00000000 0x00000001 0x00000009>; - phandle = <0x0000002b>; - }; - firmware { - compatible = "raspberrypi,bcm2835-firmware"; - mboxes = <0x00000012>; - phandle = <0x00000013>; - }; - power { - compatible = "raspberrypi,bcm2835-power"; - firmware = <0x00000013>; - #power-domain-cells = <0x00000001>; - phandle = <0x0000002c>; - }; - leds { - compatible = "gpio-leds"; - phandle = <0x0000002d>; - act { - label = "led0"; - linux,default-trigger = "mmc0"; - gpios = <0x00000009 0x0000002f 0x00000000>; - phandle = <0x0000001c>; - }; - pwr { - label = "led1"; - linux,default-trigger = "input"; - gpios = <0x00000009 0x00000023 0x00000000>; - phandle = <0x0000001d>; - }; - }; - fb { - compatible = "brcm,bcm2708-fb"; - firmware = <0x00000013>; - status = "okay"; - phandle = <0x0000002e>; - }; - vchiq { - compatible = "brcm,bcm2835-vchiq"; - reg = <0x7e00b840 0x0000000f>; - interrupts = <0x00000000 0x00000002>; - cache-line-size = <0x00000020>; - firmware = <0x00000013>; - phandle = <0x00000014>; - }; - thermal { - compatible = "brcm,bcm2835-thermal"; - firmware = <0x00000013>; - phandle = <0x0000002f>; - }; - audio { - compatible = "brcm,bcm2835-audio"; - brcm,pwm-channels = <0x00000008>; - status = "disabled"; - phandle = <0x0000001e>; - }; - sound { - status = "disabled"; - phandle = <0x00000030>; - }; - timer@7e003000 { - compatible = "brcm,bcm2835-system-timer"; - reg = <0x7e003000 0x00001000>; - interrupts = <0x00000001 0x00000000 0x00000001 0x00000001 0x00000001 0x00000002 0x00000001 0x00000003>; - clock-frequency = <0x000f4240>; - }; - arm-pmu { - compatible = "arm,arm1176-pmu"; - }; - gpiomem { - compatible = "brcm,bcm2835-gpiomem"; - reg = <0x7e200000 0x00001000>; - status = "okay"; - }; - }; - clocks { - compatible = "simple-bus"; - #address-cells = <0x00000001>; - #size-cells = <0x00000000>; - phandle = <0x00000031>; - clock@0 { - compatible = "fixed-clock"; - reg = <0x00000000>; - #clock-cells = <0x00000000>; - clock-output-names = "core"; - clock-frequency = <0x0ee6b280>; - phandle = <0x00000005>; - }; - clock@1 { - compatible = "fixed-clock"; - reg = <0x00000001>; - #clock-cells = <0x00000000>; - clock-output-names = "mmc"; - clock-frequency = <0x0ee6b280>; - phandle = <0x00000010>; - }; - clock@2 { - compatible = "fixed-clock"; - reg = <0x00000002>; - #clock-cells = <0x00000000>; - clock-output-names = "uart0_pclk"; - clock-frequency = <0x002dc6c0>; - phandle = <0x00000003>; - }; - clock@3 { - compatible = "fixed-clock"; - reg = <0x00000003>; - #clock-cells = <0x00000000>; - clock-output-names = "apb_pclk"; - clock-frequency = <0x07829b80>; - phandle = <0x00000004>; - }; - clock@4 { - compatible = "fixed-clock"; - reg = <0x00000004>; - #clock-cells = <0x00000000>; - clock-output-names = "pwm"; - clock-frequency = <0x05f5e100>; - phandle = <0x0000000d>; - }; - clock@5 { - compatible = "fixed-factor-clock"; - reg = <0x00000005>; - clocks = <0x00000005>; - #clock-cells = <0x00000000>; - clock-div = <0x00000001>; - clock-mult = <0x00000002>; - phandle = <0x0000000e>; - }; - clock@6 { - compatible = "fixed-clock"; - reg = <0x00000006>; - #clock-cells = <0x00000000>; - clock-output-names = "osc"; - clock-frequency = <0x0124f800>; - phandle = <0x00000002>; - }; - }; - __overrides__ { - cache_line_size = [00 00 00 14 63 61 63 68 65 2d 6c 69 6e 65 2d 73 69 7a 65 3a 30 00]; - uart0 = [00 00 00 15 73 74 61 74 75 73 00]; - uart0_clkrate = [00 00 00 03 63 6c 6f 63 6b 2d 66 72 65 71 75 65 6e 63 79 3a 30 00]; - uart1 = [00 00 00 16 73 74 61 74 75 73 00]; - i2s = [00 00 00 17 73 74 61 74 75 73 00]; - spi = [00 00 00 18 73 74 61 74 75 73 00]; - i2c0 = [00 00 00 19 73 74 61 74 75 73 00]; - i2c1 = [00 00 00 1a 73 74 61 74 75 73 00]; - i2c2_iknowwhatimdoing = [00 00 00 1b 73 74 61 74 75 73 00]; - i2c0_baudrate = [00 00 00 19 63 6c 6f 63 6b 2d 66 72 65 71 75 65 6e 63 79 3a 30 00]; - i2c1_baudrate = [00 00 00 1a 63 6c 6f 63 6b 2d 66 72 65 71 75 65 6e 63 79 3a 30 00]; - i2c2_baudrate = [00 00 00 1b 63 6c 6f 63 6b 2d 66 72 65 71 75 65 6e 63 79 3a 30 00]; - core_freq = [00 00 00 05 63 6c 6f 63 6b 2d 66 72 65 71 75 65 6e 63 79 3a 30 00]; - act_led_gpio = <0x0000001c 0x6770696f 0x733a3400>; - act_led_activelow = <0x0000001c 0x6770696f 0x733a3800>; - act_led_trigger = [00 00 00 1c 6c 69 6e 75 78 2c 64 65 66 61 75 6c 74 2d 74 72 69 67 67 65 72 00]; - pwr_led_gpio = <0x0000001d 0x6770696f 0x733a3400>; - pwr_led_activelow = <0x0000001d 0x6770696f 0x733a3800>; - pwr_led_trigger = [00 00 00 1d 6c 69 6e 75 78 2c 64 65 66 61 75 6c 74 2d 74 72 69 67 67 65 72 00]; - audio = [00 00 00 1e 73 74 61 74 75 73 00]; - watchdog = [00 00 00 1f 73 74 61 74 75 73 00]; - random = [00 00 00 20 73 74 61 74 75 73 00]; - sd_overclock = <0x00000021 0x6272636d 0x2c6f7665 0x72636c6f 0x636b2d35 0x303a3000>; - sd_force_pio = <0x00000021 0x6272636d 0x2c666f72 0x63652d70 0x696f3f00>; - sd_pio_limit = [00 00 00 21 62 72 63 6d 2c 70 69 6f 2d 6c 69 6d 69 74 3a 30 00]; - sd_debug = [00 00 00 21 62 72 63 6d 2c 64 65 62 75 67 00]; - }; - __symbols__ { - soc = "/soc"; - dma = "/soc/dma@7e007000"; - intc = "/soc/interrupt-controller@7e00b200"; - mailbox = "/soc/mailbox@7e00b800"; - watchdog = "/soc/watchdog@7e100000"; - cprman = "/soc/cprman@7e101000"; - random = "/soc/rng@7e104000"; - gpio = "/soc/gpio@7e200000"; - sdhost_pins = "/soc/gpio@7e200000/sdhost_pins"; - spi0_pins = "/soc/gpio@7e200000/spi0_pins"; - spi0_cs_pins = "/soc/gpio@7e200000/spi0_cs_pins"; - i2c0_pins = "/soc/gpio@7e200000/i2c0"; - i2c1_pins = "/soc/gpio@7e200000/i2c1"; - i2s_pins = "/soc/gpio@7e200000/i2s"; - uart0 = "/soc/uart@7e201000"; - sdhost = "/soc/sdhost@7e202000"; - i2s = "/soc/i2s@7e203000"; - spi0 = "/soc/spi@7e204000"; - spidev0 = "/soc/spi@7e204000/spidev@0"; - spidev1 = "/soc/spi@7e204000/spidev@1"; - i2c0 = "/soc/i2c@7e205000"; - pwm = "/soc/pwm@7e20c000"; - aux = "/soc/aux@0x7e215004"; - uart1 = "/soc/uart@7e215040"; - spi1 = "/soc/spi@7e215080"; - spi2 = "/soc/spi@7e2150C0"; - mmc = "/soc/mmc@7e300000"; - i2c1 = "/soc/i2c@7e804000"; - i2c2 = "/soc/i2c@7e805000"; - smi = "/soc/smi@7e600000"; - usb = "/soc/usb@7e980000"; - firmware = "/soc/firmware"; - power = "/soc/power"; - leds = "/soc/leds"; - act_led = "/soc/leds/act"; - pwr_led = "/soc/leds/pwr"; - fb = "/soc/fb"; - vchiq = "/soc/vchiq"; - thermal = "/soc/thermal"; - audio = "/soc/audio"; - sound = "/soc/sound"; - clocks = "/clocks"; - clk_core = "/clocks/clock@0"; - clk_mmc = "/clocks/clock@1"; - clk_uart0 = "/clocks/clock@2"; - clk_apb_p = "/clocks/clock@3"; - clk_pwm = "/clocks/clock@4"; - clk_uart1 = "/clocks/clock@5"; - clk_osc = "/clocks/clock@6"; - }; -}; diff --git a/projects/rpi_domo/dts/build.sh b/projects/rpi_domo/dts/build.sh deleted file mode 100755 index 0e43e0d3..00000000 --- a/projects/rpi_domo/dts/build.sh +++ /dev/null @@ -1,7 +0,0 @@ - -# Dump the final dtb file for the PI B+ used for the Pi_QuartetIII target. -# -#../../../../../_builds/pi_QuartetIII-release/cross/usr/bin/fdtdump bcm2708-rpi-b-plus.dtb > bcm2708-rpi-b-plus.dti -# - -../../../_builds/pi_domo-release/cross/usr/bin/dtc -O dtb -o pi_Domo.dtb pi_Domo.dts \ No newline at end of file diff --git a/projects/rpi_domo/dts/pi_Domo.dtb b/projects/rpi_domo/dts/pi_Domo.dtb deleted file mode 100644 index 674c51f0..00000000 Binary files a/projects/rpi_domo/dts/pi_Domo.dtb and /dev/null differ diff --git a/projects/rpi_domo/dts/pi_Domo.dts b/projects/rpi_domo/dts/rpi_domo.dts similarity index 70% rename from projects/rpi_domo/dts/pi_Domo.dts rename to projects/rpi_domo/dts/rpi_domo.dts index db4b741d..33b11de0 100644 --- a/projects/rpi_domo/dts/pi_Domo.dts +++ b/projects/rpi_domo/dts/rpi_domo.dts @@ -7,8 +7,10 @@ mmc { status = "okay"; }; - i2c { + i2c@7e804000 { + clock-frequency = <0x30d40>; status = "okay"; }; }; -}; \ No newline at end of file + +}; diff --git a/projects/rpi_domo/post-build.sh b/projects/rpi_domo/post-build.sh index d4be0e81..2456ad52 100755 --- a/projects/rpi_domo/post-build.sh +++ b/projects/rpi_domo/post-build.sh @@ -17,6 +17,6 @@ echo "BR_PROJECT: " ${BR_PROJECT} cp -a ${BR_PROJECT}/configs/config.txt ${BR_STAGING}/buildroot/images/ -cp -a ${BR_PROJECT}/dts/pi_Domo.dtb ${BR_STAGING}/buildroot/images/ - cp -a ${BR_STAGING}/buildroot/images/uboot-env.bin ${BR_STAGING}/buildroot/images/uboot.env + +make -C ${BR_PROJECT} dtb diff --git a/projects/rpi_domo/uboot/boot.cmd b/projects/rpi_domo/uboot/boot.cmd index f8a3bbaf..36d10d9d 100644 --- a/projects/rpi_domo/uboot/boot.cmd +++ b/projects/rpi_domo/uboot/boot.cmd @@ -1,6 +1,6 @@ mmc dev 0 fatload mmc 0:1 ${kernel_addr_r} zImage -fatload mmc 0:1 ${fdt_addr_r} pi_Domo.dtb +fatload mmc 0:1 ${fdt_addr_r} rpi_domo.dtb fatload mmc 0:1 ${ramdisk_addr_r} rootfs.cpio.uboot setenv mmc_freq 'sdhci-bcm2708.emmc_clock_freq=250000000 sdhci-bcm2708.enable_llm=0' setenv bootargs ${mmc_freq} console=ttyAMA0,115200 diff --git a/src/3P/ubox/builders/cmake/CMakeLists.txt b/src/3P/ubox/builders/cmake/CMakeLists.txt index 9c3c4702..37250946 100644 --- a/src/3P/ubox/builders/cmake/CMakeLists.txt +++ b/src/3P/ubox/builders/cmake/CMakeLists.txt @@ -8,7 +8,7 @@ set (CMAKE_MODULE_PATH "${MODULE_PATH}") set(DISABLE_TARGET_OPTIMIZATION ON) -include (aw) +include (br) # Logd