Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2025-02-27 12:57:13 +00:00
Code Issues Projects Releases Packages Wiki Activity

x86: Fix device-tree indentation

Browse source 
With the use of a phandle we can outdent the device tree nodes a little.
Fix this.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
This commit is contained in:
Simon Glass 2019-05-02 10:52:21 -06:00 • committed by Bin Meng
parent c5edefb7f7
commit e766d9f183
1 changed files with 73 additions and 74 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

147
arch/x86/dts/u-boot.dtsi
View file

@ -23,42 +23,41 @@
#ifdef CONFIG_ROM_SIZE #ifdef CONFIG_ROM_SIZE
&rom { &rom {
filename = "u-boot.rom"; filename = "u-boot.rom";
end-at-4gb; end-at-4gb;
sort-by-offset; sort-by-offset;
pad-byte = <0xff>; pad-byte = <0xff>;
size = <CONFIG_ROM_SIZE>; size = <CONFIG_ROM_SIZE>;
#ifdef CONFIG_HAVE_INTEL_ME #ifdef CONFIG_HAVE_INTEL_ME
intel-descriptor { intel-descriptor {
filename = CONFIG_FLASH_DESCRIPTOR_FILE; filename = CONFIG_FLASH_DESCRIPTOR_FILE;
}; };
intel-me { intel-me {
filename = CONFIG_INTEL_ME_FILE; filename = CONFIG_INTEL_ME_FILE;
}; };
#endif #endif
#ifdef CONFIG_TPL #ifdef CONFIG_TPL
u-boot-tpl-with-ucode-ptr { u-boot-tpl-with-ucode-ptr {
offset = <CONFIG_TPL_TEXT_BASE>; offset = <CONFIG_TPL_TEXT_BASE>;
}; };
u-boot-tpl-dtb { u-boot-tpl-dtb {
}; };
u-boot-spl { u-boot-spl {
offset = <CONFIG_SPL_TEXT_BASE>; offset = <CONFIG_SPL_TEXT_BASE>;
}; };
u-boot-spl-dtb { u-boot-spl-dtb {
}; };
u-boot { u-boot {
offset = <CONFIG_SYS_TEXT_BASE>; offset = <CONFIG_SYS_TEXT_BASE>;
}; };
#elif defined(CONFIG_SPL) #elif defined(CONFIG_SPL)
u-boot-spl-with-ucode-ptr { u-boot-spl-with-ucode-ptr {
offset = <CONFIG_SPL_TEXT_BASE>; offset = <CONFIG_SPL_TEXT_BASE>;
}; };
u-boot-dtb-with-ucode2 {
u-boot-dtb-with-ucode2 { type = "u-boot-dtb-with-ucode";
type = "u-boot-dtb-with-ucode"; };
}; u-boot {
u-boot {
/* /*
* TODO(sjg@chromium.org): * TODO(sjg@chromium.org):
* Normally we use CONFIG_SYS_TEXT_BASE as the flash offset. But * Normally we use CONFIG_SYS_TEXT_BASE as the flash offset. But
@ -68,67 +67,67 @@
* We need a better solution, perhaps a separate Kconfig. * We need a better solution, perhaps a separate Kconfig.
*/ */
#if CONFIG_SYS_TEXT_BASE == 0x1110000 #if CONFIG_SYS_TEXT_BASE == 0x1110000
offset = <0xfff00000>; offset = <0xfff00000>;
#else #else
offset = <CONFIG_SYS_TEXT_BASE>; offset = <CONFIG_SYS_TEXT_BASE>;
#endif #endif
}; };
#else #else
u-boot-with-ucode-ptr { u-boot-with-ucode-ptr {
offset = <CONFIG_SYS_TEXT_BASE>; offset = <CONFIG_SYS_TEXT_BASE>;
}; };
#endif #endif
u-boot-dtb-with-ucode { u-boot-dtb-with-ucode {
}; };
u-boot-ucode { u-boot-ucode {
align = <16>; align = <16>;
}; };
#ifdef CONFIG_HAVE_MRC #ifdef CONFIG_HAVE_MRC
intel-mrc { intel-mrc {
offset = <CONFIG_X86_MRC_ADDR>; offset = <CONFIG_X86_MRC_ADDR>;
}; };
#endif #endif
#ifdef CONFIG_HAVE_FSP #ifdef CONFIG_HAVE_FSP
intel-fsp { intel-fsp {
filename = CONFIG_FSP_FILE; filename = CONFIG_FSP_FILE;
offset = <CONFIG_FSP_ADDR>; offset = <CONFIG_FSP_ADDR>;
}; };
#endif #endif
#ifdef CONFIG_HAVE_CMC #ifdef CONFIG_HAVE_CMC
intel-cmc { intel-cmc {
filename = CONFIG_CMC_FILE; filename = CONFIG_CMC_FILE;
offset = <CONFIG_CMC_ADDR>; offset = <CONFIG_CMC_ADDR>;
}; };
#endif #endif
#ifdef CONFIG_HAVE_VGA_BIOS #ifdef CONFIG_HAVE_VGA_BIOS
intel-vga { intel-vga {
filename = CONFIG_VGA_BIOS_FILE; filename = CONFIG_VGA_BIOS_FILE;
offset = <CONFIG_VGA_BIOS_ADDR>; offset = <CONFIG_VGA_BIOS_ADDR>;
}; };
#endif #endif
#ifdef CONFIG_HAVE_VBT #ifdef CONFIG_HAVE_VBT
intel-vbt { intel-vbt {
filename = CONFIG_VBT_FILE; filename = CONFIG_VBT_FILE;
offset = <CONFIG_VBT_ADDR>; offset = <CONFIG_VBT_ADDR>;
}; };
#endif #endif
#ifdef CONFIG_HAVE_REFCODE #ifdef CONFIG_HAVE_REFCODE
intel-refcode { intel-refcode {
offset = <CONFIG_X86_REFCODE_ADDR>; offset = <CONFIG_X86_REFCODE_ADDR>;
}; };
#endif #endif
#ifdef CONFIG_TPL #ifdef CONFIG_TPL
x86-start16-tpl { x86-start16-tpl {
offset = <CONFIG_SYS_X86_START16>; offset = <CONFIG_SYS_X86_START16>;
}; };
#elif defined(CONFIG_SPL) #elif defined(CONFIG_SPL)
x86-start16-spl { x86-start16-spl {
offset = <CONFIG_SYS_X86_START16>; offset = <CONFIG_SYS_X86_START16>;
}; };
#else #else
x86-start16 { x86-start16 {
offset = <CONFIG_SYS_X86_START16>; offset = <CONFIG_SYS_X86_START16>;
}; };
#endif #endif
}; };
#endif #endif