[haiku-commits] haiku: hrev48187 - in src/data/dts/arch/arm: . src/data/dts
- From: revol@xxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Fri, 31 Oct 2014 16:28:51 +0100 (CET)
hrev48187 adds 2 changesets to branch 'master'
old head: 6a80e6889ad1f00ec1c8ec1193ff5e346fcd73b7
new head: 960598d4c3fba67565d4e5b3e778ba786f3bb947
overview: http://cgit.haiku-os.org/haiku/log/?qt=range&q=960598d+%5E6a80e68
----------------------------------------------------------------------------
88d5150: Move ARM device tree files to an arch-specific subfolder
FDT are also used on PPC at least, and at least skeleton.dtsi
might clash since there is a different one for PPC.
960598d: norflash: Fix warning
[ François Revol <revol@xxxxxxx> ]
----------------------------------------------------------------------------
19 files changed, 9 insertions(+), 4 deletions(-)
build/jam/MainBuildRules | 7 ++++++-
src/add-ons/kernel/drivers/disk/norflash/norflash.cpp | 4 ++--
src/data/dts/{ => arch/arm}/bcm2835.dtsi | 0
src/data/dts/{ => arch/arm}/omap3-beagle-xm.dts | 0
src/data/dts/{ => arch/arm}/omap3.dtsi | 0
src/data/dts/{ => arch/arm}/omap34xx-omap36xx-clocks.dtsi | 0
.../{ => arch/arm}/omap36xx-am35xx-omap3430es2plus-clocks.dtsi | 0
src/data/dts/{ => arch/arm}/omap36xx-clocks.dtsi | 0
.../dts/{ => arch/arm}/omap36xx-omap3430es2plus-clocks.dtsi | 0
src/data/dts/{ => arch/arm}/omap36xx.dtsi | 0
src/data/dts/{ => arch/arm}/omap3xxx-clocks.dtsi | 0
src/data/dts/{ => arch/arm}/pxa27x.dtsi | 0
src/data/dts/{ => arch/arm}/pxa2xx.dtsi | 0
src/data/dts/{ => arch/arm}/rpi.dts | 0
src/data/dts/{ => arch/arm}/skeleton.dtsi | 0
src/data/dts/{ => arch/arm}/twl4030.dtsi | 0
src/data/dts/{ => arch/arm}/twl4030_omap3.dtsi | 0
src/data/dts/{ => arch/arm}/verdex.dts | 0
src/system/boot/platform/u-boot/Jamfile | 2 +-
############################################################################
Commit: 88d51506d0f23af02f95b881c85a2aba204c1e23
URL: http://cgit.haiku-os.org/haiku/commit/?id=88d5150
Author: François Revol <revol@xxxxxxx>
Date: Fri Oct 31 15:24:24 2014 UTC
Move ARM device tree files to an arch-specific subfolder
FDT are also used on PPC at least, and at least skeleton.dtsi
might clash since there is a different one for PPC.
----------------------------------------------------------------------------
diff --git a/build/jam/MainBuildRules b/build/jam/MainBuildRules
index 00a0c61..7fd8a76 100644
--- a/build/jam/MainBuildRules
+++ b/build/jam/MainBuildRules
@@ -192,7 +192,12 @@ rule CompileDTS
actions CompileDTS
{
- cpp -P -xassembler-with-cpp -I$(HAIKU_TOP)/src/data/dts/ $(2) | dtc -O
dtb -o $(1) -i $(HAIKU_TOP)/src/data/dts ;
+ cpp -P -xassembler-with-cpp \
+ -I$(HAIKU_TOP)/src/data/dts/arch/$(TARGET_ARCH) \
+ -I$(HAIKU_TOP)/src/data/dts $(2) \
+ | dtc -O dtb -o $(1) \
+ -i $(HAIKU_TOP)/src/data/dts/arch/$(TARGET_ARCH) \
+ -i $(HAIKU_TOP)/src/data/dts ;
}
rule Ld
diff --git a/src/data/dts/bcm2835.dtsi b/src/data/dts/arch/arm/bcm2835.dtsi
similarity index 100%
rename from src/data/dts/bcm2835.dtsi
rename to src/data/dts/arch/arm/bcm2835.dtsi
diff --git a/src/data/dts/omap3-beagle-xm.dts
b/src/data/dts/arch/arm/omap3-beagle-xm.dts
similarity index 100%
rename from src/data/dts/omap3-beagle-xm.dts
rename to src/data/dts/arch/arm/omap3-beagle-xm.dts
diff --git a/src/data/dts/omap3.dtsi b/src/data/dts/arch/arm/omap3.dtsi
similarity index 100%
rename from src/data/dts/omap3.dtsi
rename to src/data/dts/arch/arm/omap3.dtsi
diff --git a/src/data/dts/omap34xx-omap36xx-clocks.dtsi
b/src/data/dts/arch/arm/omap34xx-omap36xx-clocks.dtsi
similarity index 100%
rename from src/data/dts/omap34xx-omap36xx-clocks.dtsi
rename to src/data/dts/arch/arm/omap34xx-omap36xx-clocks.dtsi
diff --git a/src/data/dts/omap36xx-am35xx-omap3430es2plus-clocks.dtsi
b/src/data/dts/arch/arm/omap36xx-am35xx-omap3430es2plus-clocks.dtsi
similarity index 100%
rename from src/data/dts/omap36xx-am35xx-omap3430es2plus-clocks.dtsi
rename to src/data/dts/arch/arm/omap36xx-am35xx-omap3430es2plus-clocks.dtsi
diff --git a/src/data/dts/omap36xx-clocks.dtsi
b/src/data/dts/arch/arm/omap36xx-clocks.dtsi
similarity index 100%
rename from src/data/dts/omap36xx-clocks.dtsi
rename to src/data/dts/arch/arm/omap36xx-clocks.dtsi
diff --git a/src/data/dts/omap36xx-omap3430es2plus-clocks.dtsi
b/src/data/dts/arch/arm/omap36xx-omap3430es2plus-clocks.dtsi
similarity index 100%
rename from src/data/dts/omap36xx-omap3430es2plus-clocks.dtsi
rename to src/data/dts/arch/arm/omap36xx-omap3430es2plus-clocks.dtsi
diff --git a/src/data/dts/omap36xx.dtsi b/src/data/dts/arch/arm/omap36xx.dtsi
similarity index 100%
rename from src/data/dts/omap36xx.dtsi
rename to src/data/dts/arch/arm/omap36xx.dtsi
diff --git a/src/data/dts/omap3xxx-clocks.dtsi
b/src/data/dts/arch/arm/omap3xxx-clocks.dtsi
similarity index 100%
rename from src/data/dts/omap3xxx-clocks.dtsi
rename to src/data/dts/arch/arm/omap3xxx-clocks.dtsi
diff --git a/src/data/dts/pxa27x.dtsi b/src/data/dts/arch/arm/pxa27x.dtsi
similarity index 100%
rename from src/data/dts/pxa27x.dtsi
rename to src/data/dts/arch/arm/pxa27x.dtsi
diff --git a/src/data/dts/pxa2xx.dtsi b/src/data/dts/arch/arm/pxa2xx.dtsi
similarity index 100%
rename from src/data/dts/pxa2xx.dtsi
rename to src/data/dts/arch/arm/pxa2xx.dtsi
diff --git a/src/data/dts/rpi.dts b/src/data/dts/arch/arm/rpi.dts
similarity index 100%
rename from src/data/dts/rpi.dts
rename to src/data/dts/arch/arm/rpi.dts
diff --git a/src/data/dts/skeleton.dtsi b/src/data/dts/arch/arm/skeleton.dtsi
similarity index 100%
rename from src/data/dts/skeleton.dtsi
rename to src/data/dts/arch/arm/skeleton.dtsi
diff --git a/src/data/dts/twl4030.dtsi b/src/data/dts/arch/arm/twl4030.dtsi
similarity index 100%
rename from src/data/dts/twl4030.dtsi
rename to src/data/dts/arch/arm/twl4030.dtsi
diff --git a/src/data/dts/twl4030_omap3.dtsi
b/src/data/dts/arch/arm/twl4030_omap3.dtsi
similarity index 100%
rename from src/data/dts/twl4030_omap3.dtsi
rename to src/data/dts/arch/arm/twl4030_omap3.dtsi
diff --git a/src/data/dts/verdex.dts b/src/data/dts/arch/arm/verdex.dts
similarity index 100%
rename from src/data/dts/verdex.dts
rename to src/data/dts/arch/arm/verdex.dts
diff --git a/src/system/boot/platform/u-boot/Jamfile
b/src/system/boot/platform/u-boot/Jamfile
index 4462813..24bb901 100644
--- a/src/system/boot/platform/u-boot/Jamfile
+++ b/src/system/boot/platform/u-boot/Jamfile
@@ -212,7 +212,7 @@ BuildUImage haiku_loader_linux.ub : haiku_loader :
-n 'haiku_loader $(TARGET_BOOT_BOARD)' ;
local fdtBinary = [ FDirName $(HAIKU_OUTPUT_DIR) $(HAIKU_BOARD_FDT_NAME).dtb ]
;
-CompileDTS $(fdtBinary) : [ FDirName $(HAIKU_TOP) src data dts
$(HAIKU_BOARD_FDT_NAME).dts ] ;
+CompileDTS $(fdtBinary) : [ FDirName $(HAIKU_TOP) src data dts arch
$(TARGET_ARCH) $(HAIKU_BOARD_FDT_NAME).dts ] ;
BuildUImage haiku_loader_nbsd.ub : haiku_loader $(tgzArchive) $(fdtBinary) :
-A $(TARGET_ARCH) -O $(uImageFakeOS) -T multi -C none
############################################################################
Revision: hrev48187
Commit: 960598d4c3fba67565d4e5b3e778ba786f3bb947
URL: http://cgit.haiku-os.org/haiku/commit/?id=960598d
Author: François Revol <revol@xxxxxxx>
Date: Fri Oct 31 15:28:01 2014 UTC
norflash: Fix warning
----------------------------------------------------------------------------
diff --git a/src/add-ons/kernel/drivers/disk/norflash/norflash.cpp
b/src/add-ons/kernel/drivers/disk/norflash/norflash.cpp
index fc9de2a..5dbbb65 100644
--- a/src/add-ons/kernel/drivers/disk/norflash/norflash.cpp
+++ b/src/add-ons/kernel/drivers/disk/norflash/norflash.cpp
@@ -42,7 +42,7 @@ struct nor_driver_info {
size_t totalsize;
area_id id;
- void *mapped;
+ uint8 *mapped;
};
@@ -59,7 +59,7 @@ nor_init_device(void *_info, void **_cookie)
info->blocksize = 128 * 1024;
info->totalsize = (SIZE_IN_BLOCKS - HIDDEN_BLOCKS) * info->blocksize;
- info->id = map_physical_memory("NORFlash", NORFLASH_ADDR,
info->totalsize, B_ANY_KERNEL_ADDRESS, B_READ_AREA, &info->mapped);
+ info->id = map_physical_memory("NORFlash", NORFLASH_ADDR,
info->totalsize, B_ANY_KERNEL_ADDRESS, B_READ_AREA, (void **)&info->mapped);
if (info->id < 0)
return info->id;
Other related posts:
- » [haiku-commits] haiku: hrev48187 - in src/data/dts/arch/arm: . src/data/dts - revol
