Skip to content

Commit

Permalink
Makefile: Fix u-boot env script, rename dt node axi->amba
Browse files Browse the repository at this point in the history
In Linux 5.10 Xilinx changed their /amba node name to /axi.
This causes a regression, since our u-boot env scripts assume /amba

This patch restores backward compatibility, by renaming the nodes.

Signed-off-by: Michael Hennerich <[email protected]>
  • Loading branch information
mhennerich committed Feb 23, 2022
1 parent cbe7306 commit 60c81d0
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -106,10 +106,10 @@ build/zImage: linux/arch/arm/boot/zImage | build
### Device Tree ###

linux/arch/arm/boot/dts/%.dtb: linux/arch/arm/boot/dts/%.dts linux/arch/arm/boot/dts/zynq-pluto-sdr.dtsi
make -C linux -j $(NCORES) ARCH=arm CROSS_COMPILE=$(CROSS_COMPILE) $(notdir $@)
DTC_FLAGS=-@ make -C linux -j $(NCORES) ARCH=arm CROSS_COMPILE=$(CROSS_COMPILE) $(notdir $@)

build/%.dtb: linux/arch/arm/boot/dts/%.dtb | build
cp $< $@
dtc -q -@ -I dtb -O dts $< | sed 's/axi {/amba {/g' | dtc -q -@ -I dts -O dtb -o $@

### Buildroot ###

Expand Down

0 comments on commit 60c81d0

Please sign in to comment.