diff --git a/os/12_build_uboot.sh b/os/12_build_uboot.sh
index a9a46b4..2ecd9cd 100755
--- a/os/12_build_uboot.sh
+++ b/os/12_build_uboot.sh
@@ -7,9 +7,9 @@ setup_toolchain
 
 make -C "$UBOOT_DIR" CROSS_COMPILE=arm-linux- distclean
 
-cp -a devicetree/redpitaya_puzzlefw_uboot.dts "$UBOOT_DIR/arch/arm/dts/redpitaya.dts"
-cp -a config/uboot_redpitaya_puzzlefw_defconfig "$UBOOT_DIR/.config"
+cp -a devicetree/redpitaya_puzzlefw.dts "$UBOOT_DIR/arch/arm/dts/redpitaya.dts"
+cp -a config/uboot_redpitaya_puzzlefw_defconfig "$UBOOT_DIR/configs/redpitaya_puzzlefw_defconfig"
 
-make -C "$UBOOT_DIR" CROSS_COMPILE=arm-linux- olddefconfig
+make -C "$UBOOT_DIR" CROSS_COMPILE=arm-linux- redpitaya_puzzlefw_defconfig
 make -C "$UBOOT_DIR" CROSS_COMPILE=arm-linux-
 
diff --git a/os/devicetree/redpitaya_puzzlefw.dts b/os/devicetree/redpitaya_puzzlefw.dts
index 3c9bfff..f8bd026 100644
--- a/os/devicetree/redpitaya_puzzlefw.dts
+++ b/os/devicetree/redpitaya_puzzlefw.dts
@@ -117,22 +117,15 @@
 
 &i2c0 {
 	status = "okay";
+	clock-frequency = <100000>;
 
 	// Red Pitaya: EEPROM chip on internal I2C bus.
-
 	eeprom@50 {
 		compatible = "24c64";
 		reg = <0x50>;
 		pagesize = <32>;
 	};
 
-/*
-	eeprom@51 {
-		compatible = "24c64";
-		reg = <0x51>;
-		pagesize = <32>;
-	};
-*/
 };
 
 &intc {
@@ -156,15 +149,15 @@
 };
 
 &spi0 {
+	status = "okay";
 	is-decoded-cs = <0>;
 	num-cs = <3>;
-	status = "okay";
 };
 
 &spi1 {
+	status = "okay";
 	is-decoded-cs = <0>;
 	num-cs = <1>;
-	status = "okay";
 };
 
 &uart0 {
diff --git a/os/devicetree/redpitaya_puzzlefw_uboot.dts b/os/devicetree/redpitaya_puzzlefw_uboot.dts
deleted file mode 100644
index bd7b6b6..0000000
--- a/os/devicetree/redpitaya_puzzlefw_uboot.dts
+++ /dev/null
@@ -1,92 +0,0 @@
-
-/dts-v1/;
-
-#include "zynq-7000.dtsi"
-
-/ {
-	model = "RedPitaya PuzzleFW";
-	compatible = "xlnx,zynq-7000";
-
-	aliases {
-		ethernet0 = &gem0;
-		i2c0 = &i2c0;
-		serial0 = &uart0;
-		mmc0 = &sdhci0;
-		nvmem0 = &eeprom;
-	};
-
-	memory@0 {
-		device_type = "memory";
-		reg = <0x0 0x20000000>;
-	};
-
-	chosen {
-		bootargs = "";
-		stdout-path = "serial0:115200n8";
-	};
-
-};
-
-&clkc {
-	ps-clk-frequency = <33333333>;
-};
-
-&gem0 {
-	status = "okay";
-	xlnx,ptp-enet-clock = <0x69f6bcb>;
-	phy-mode = "rgmii-id";
-	phy-handle = <&ethernet_phy>;
-
-	ethernet_phy: ethernet-phy@1 {
-		reg = <1>;
-		device_type = "ethernet-phy";
-	};
-};
-
-&gpio0 {
-        emio-gpio-width = <24>;
-        gpio-mask-high = <0x0>;
-        gpio-mask-low = <0x5600>;
-};
-
-&i2c0 {
-	status = "okay";
-	clock-frequency = <400000>;
-
-	eeprom: eeprom@50 {
-		compatible = "24c64";
-		reg = <0x50>;
-		pagesize = <32>;
-	};
-};
-
-&qspi {
-	bootph-all;
-	status = "okay";
-	num-cs = <1>;
-	flash@0 {
-		compatible = "n25q128a11", "jedec,spi-nor";
-		reg = <0x0>;
-		spi-tx-bus-width = <1>;
-		spi-rx-bus-width = <4>;
-		spi-max-frequency = <50000000>;
-	};
-};
-
-&sdhci0 {
-	bootph-all;
-	status = "okay";
-};
-
-&uart0 {
-	status = "okay";
-	device_type = "serial";
-	cts-override;
-};
-
-&uart1 {
-	status = "okay";
-	device_type = "serial";
-	cts-override;
-};
-