Skip to content

arch: microblaze,nios2: unify dtb build test into one build and extend to microblaze & nios2 #840

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
commodo merged 7 commits into from
Jan 23, 2020
Merged

arch: microblaze,nios2: unify dtb build test into one build and extend to microblaze & nios2 #840

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
9b17b5d
ci,build: run all device-trees in a single build
commodo Jan 21, 2020
ac22378
ci,build: patch kernel build only during Travis-CI for dtb_build_test
commodo Jan 21, 2020
43e2a42
arch: microblaze: rename '/include/' -> '#include'
commodo Jan 22, 2020
c000716
arch: microblaze: include gpio dt-binding header
commodo Jan 22, 2020
75bb289
arch: microblaze: rename vcu118_quad_ad9081.dts -> vcu118_quad_ad9081…
commodo Jan 22, 2020
6737adc
ci,build: use number of jobs for dtb_build_test
commodo Jan 22, 2020
ccefd11
ci,build: add minor hack for nios2 device-trees
commodo Jan 22, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,12 @@ matrix:
env: BUILD_TYPE=sync_branches_with_master_travis DO_NOT_DOCKERIZE=1
- checkpatch: 1
env: BUILD_TYPE=checkpatch DO_NOT_DOCKERIZE=1
- env: BUILD_TYPE=dtb_build_test ARCH=arm DO_NOT_DOCKERIZE=1
DTS_FILES="arch/arm/boot/dts/zynq-*.dts arch/arm/boot/dts/socfpga_*.dts"
- env: BUILD_TYPE=dtb_build_test ARCH=arm64 DTS_FILES=arch/arm64/boot/dts/xilinx/zynqmp-*.dts DO_NOT_DOCKERIZE=1
- env: BUILD_TYPE=dtb_build_test DO_NOT_DOCKERIZE=1
DTS_FILES="arch/arm/boot/dts/zynq-*.dts"
DTS_FILES="$DTS_FILES arch/arm/boot/dts/socfpga_*.dts"
DTS_FILES="$DTS_FILES arch/arm64/boot/dts/xilinx/zynqmp-*.dts"
DTS_FILES="$DTS_FILES arch/microblaze/boot/dts/*.dts"
DTS_FILES="$DTS_FILES arch/nios2/boot/dts/*.dts"
- env: DEFCONFIG=zynq_xcomm_adv7511_defconfig ARCH=arm IMAGE=uImage
CHECK_ALL_ADI_DRIVERS_HAVE_BEEN_BUILT=1
- env: DEFCONFIG=zynq_pluto_defconfig ARCH=arm IMAGE=uImage
Expand Down
2 changes: 1 addition & 1 deletion arch/microblaze/boot/dts/kc705.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
/dts-v1/;
/include/ "kc705.dtsi"
#include "kc705.dtsi"
2 changes: 1 addition & 1 deletion arch/microblaze/boot/dts/kc705_ad9467_fmc.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
* Copyright (C) 2016-2019 Analog Devices Inc.
*/
/dts-v1/;
/include/ "kc705.dtsi"
#include "kc705.dtsi"

#define fmc_i2c fmc_lpc_iic
#define fmc_spi axi_spi
Expand Down
2 changes: 1 addition & 1 deletion arch/microblaze/boot/dts/kc705_fmcdaq2.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
* Copyright 2016-2020 Analog Devices Inc.
*/
/dts-v1/;
/include/ "kc705.dtsi"
#include "kc705.dtsi"

#define fmc_i2c fmc_hpc_iic
#define fmc_spi axi_spi
Expand Down
2 changes: 1 addition & 1 deletion arch/microblaze/boot/dts/kc705_fmcjesdadc1.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@

/dts-v1/;
/include/ "kc705.dtsi"
#include "kc705.dtsi"

#define fmc_i2c fmc_hpc_iic
#define fmc_spi axi_spi
Expand Down
2 changes: 1 addition & 1 deletion arch/microblaze/boot/dts/kc705_fmcomms1.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@

/dts-v1/;
/include/ "kc705.dtsi"
#include "kc705.dtsi"

#define fmc_i2c fmc_lpc_iic

Expand Down
2 changes: 1 addition & 1 deletion arch/microblaze/boot/dts/kc705_fmcomms2-3.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@

/dts-v1/;
/include/ "kc705.dtsi"
#include "kc705.dtsi"

#define fmc_i2c fmc_lpc_iic
#define fmc_spi axi_spi
Expand Down
2 changes: 1 addition & 1 deletion arch/microblaze/boot/dts/kc705_fmcomms4.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@

/dts-v1/;
/include/ "kc705.dtsi"
#include "kc705.dtsi"

#define fmc_i2c fmc_lpc_iic
#define fmc_spi axi_spi
Expand Down
2 changes: 1 addition & 1 deletion arch/microblaze/boot/dts/kcu105.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
/dts-v1/;
/include/ "kcu105.dtsi"
#include "kcu105.dtsi"
1 change: 1 addition & 0 deletions arch/microblaze/boot/dts/kcu105.dtsi
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#include <dt-bindings/gpio/gpio.h>

/ {
#address-cells = <1>;
Expand Down
2 changes: 1 addition & 1 deletion arch/microblaze/boot/dts/kcu105_adrv9371x.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
* Copyright 2016-2020 Analog Devices Inc.
*/
/dts-v1/;
/include/ "kcu105.dtsi"
#include "kcu105.dtsi"

#define fmc_i2c fmc_hpc_iic
#define fmc_spi axi_spi
Expand Down
2 changes: 1 addition & 1 deletion arch/microblaze/boot/dts/kcu105_fmcdaq2.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
* Copyright 2016-2020 Analog Devices Inc.
*/
/dts-v1/;
/include/ "kcu105.dtsi"
#include "kcu105.dtsi"

#define fmc_i2c fmc_hpc_iic
#define fmc_spi axi_spi
Expand Down
2 changes: 1 addition & 1 deletion arch/microblaze/boot/dts/kcu105_fmcdaq3.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@

/dts-v1/;
/include/ "kcu105.dtsi"
#include "kcu105.dtsi"

#define fmc_i2c fmc_hpc_iic
#define fmc_spi axi_spi
Expand Down
2 changes: 1 addition & 1 deletion arch/microblaze/boot/dts/kcu105_fmcomms2-3.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@

/dts-v1/;
/include/ "kcu105.dtsi"
#include "kcu105.dtsi"

#define fmc_i2c fmc_lpc_iic
#define fmc_spi axi_spi
Expand Down
2 changes: 1 addition & 1 deletion arch/microblaze/boot/dts/kcu105_fmcomms4.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@

/dts-v1/;
/include/ "kcu105.dtsi"
#include "kcu105.dtsi"

#define fmc_i2c fmc_lpc_iic
#define fmc_spi axi_spi
Expand Down
2 changes: 1 addition & 1 deletion arch/microblaze/boot/dts/vc707.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
/dts-v1/;
/include/ "vc707.dtsi"
#include "vc707.dtsi"
2 changes: 1 addition & 1 deletion arch/microblaze/boot/dts/vc707_ad6676evb.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
* Copyright (C) 2016-2019 Analog Devices Inc.
*/
/dts-v1/;
/include/ "vc707.dtsi"
#include "vc707.dtsi"

#define fmc_i2c fmc1_hpc_iic
#define fmc_spi axi_spi
Expand Down
2 changes: 1 addition & 1 deletion arch/microblaze/boot/dts/vc707_fmcadc2.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@

/dts-v1/;
/include/ "vc707.dtsi"
#include "vc707.dtsi"

#define fmc_i2c fmc1_hpc_iic
#define fmc_spi axi_spi
Expand Down
2 changes: 1 addition & 1 deletion arch/microblaze/boot/dts/vc707_fmcadc5.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@

/dts-v1/;
/include/ "vc707.dtsi"
#include "vc707.dtsi"

#define fmc_i2c fmc1_hpc_iic
#define fmc_spi axi_spi
Expand Down
2 changes: 1 addition & 1 deletion arch/microblaze/boot/dts/vc707_fmcdaq2.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@

/dts-v1/;
/include/ "vc707.dtsi"
#include "vc707.dtsi"

#define fmc_i2c fmc1_hpc_iic
#define fmc_spi axi_spi
Expand Down
2 changes: 1 addition & 1 deletion arch/microblaze/boot/dts/vc707_fmcjesdadc1.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@

/dts-v1/;
/include/ "vc707.dtsi"
#include "vc707.dtsi"

#define fmc_i2c fmc1_hpc_iic
#define fmc_spi axi_spi
Expand Down
2 changes: 1 addition & 1 deletion arch/microblaze/boot/dts/vc707_fmcomms1.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@

/dts-v1/;
/include/ "vc707.dtsi"
#include "vc707.dtsi"

#define fmc_i2c fmc1_hpc_iic

Expand Down
2 changes: 1 addition & 1 deletion arch/microblaze/boot/dts/vc707_fmcomms2-3.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@

/dts-v1/;
/include/ "vc707.dtsi"
#include "vc707.dtsi"

#define fmc_i2c fmc1_hpc_iic
#define fmc_spi axi_spi
Expand Down
2 changes: 1 addition & 1 deletion arch/microblaze/boot/dts/vc707_fmcomms4.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@

/dts-v1/;
/include/ "vc707.dtsi"
#include "vc707.dtsi"

#define fmc_i2c fmc1_hpc_iic
#define fmc_spi axi_spi
Expand Down
2 changes: 1 addition & 1 deletion arch/microblaze/boot/dts/vcu118.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
/dts-v1/;
/include/ "vcu118.dtsi"
#include "vcu118.dtsi"
1 change: 1 addition & 0 deletions arch/microblaze/boot/dts/vcu118.dtsi
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#include <dt-bindings/gpio/gpio.h>

/ {
#address-cells = <1>;
Expand Down
2 changes: 1 addition & 1 deletion arch/microblaze/boot/dts/vcu118_ad9081.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* Copyright (C) 2019 Analog Devices Inc.
*/
/dts-v1/;
/include/ "vcu118.dtsi"
#include "vcu118.dtsi"

#define fmc_i2c fmcp_hspc_iic
#define fmc_spi axi_spi
Expand Down
2 changes: 1 addition & 1 deletion arch/microblaze/boot/dts/vcu118_dual_ad9208.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: GPL-2.0
/dts-v1/;
/include/ "vcu118.dtsi"
#include "vcu118.dtsi"

#define fmc_i2c fmcp_hspc_iic
#define fmc_spi axi_spi
Expand Down
2 changes: 1 addition & 1 deletion arch/microblaze/boot/dts/vcu118_fmcdaq3.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@

/dts-v1/;
/include/ "vcu118.dtsi"
#include "vcu118.dtsi"

#define fmc_i2c fmcp_hspc_iic
#define fmc_spi axi_spi
Expand Down
2 changes: 1 addition & 1 deletion ...icroblaze/boot/dts/vcu118_quad_ad9081.dts → ...croblaze/boot/dts/vcu118_quad_ad9081.dtsi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* Copyright (C) 2019 Analog Devices Inc.
*/
/dts-v1/;
/include/ "vcu118.dtsi"
#include "vcu118.dtsi"

#define fmc_i2c fmcp_hspc_iic
#define fmc_spi axi_spi
Expand Down
4 changes: 2 additions & 2 deletions arch/microblaze/boot/dts/vcu118_quad_ad9081_m8_l4.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
#include <dt-bindings/iio/adc/adi,ad9081.h>
#include <dt-bindings/gpio/gpio.h>

#include "vcu118_quad_ad9081.dts"
#include "vcu118_quad_ad9081.dtsi"

#define ADRF4360_RF16_FREQUENCY_HZ 12000000000
//#define ADRF4360_RF16_FREQUENCY_HZ 500000000
Expand Down Expand Up @@ -1248,4 +1248,4 @@
rx1-enable-gpios = <&axi_gpio 48 0>;
tx2-enable-gpios = <&axi_gpio 60 0>;
tx1-enable-gpios = <&axi_gpio 56 0>;
};
};
Loading