diff options
| author | Andrew Waterman <andrew@sifive.com> | 2020-10-30 15:28:04 -0700 |
|---|---|---|
| committer | Andrew Waterman <andrew@sifive.com> | 2020-10-30 15:28:04 -0700 |
| commit | def2f01eee49aa639c6e393d161687998cd64c4e (patch) | |
| tree | a0e2d1d247ea8fcf5fb3daf63c04db0103a7725c /machine | |
| parent | a161e6f3ef31004e47a5b94b85c2e84b764f8637 (diff) | |
| download | riscv-pk-def2f01eee49aa639c6e393d161687998cd64c4e.zip riscv-pk-def2f01eee49aa639c6e393d161687998cd64c4e.tar.gz riscv-pk-def2f01eee49aa639c6e393d161687998cd64c4e.tar.bz2 | |
Revert "Disable device tree filter when load a dts from file (#217)"
This reverts commit a161e6f3ef31004e47a5b94b85c2e84b764f8637.
Resolves #218
Diffstat (limited to 'machine')
| -rw-r--r-- | machine/machine.ac | 4 | ||||
| -rw-r--r-- | machine/machine.mk.in | 5 | ||||
| -rw-r--r-- | machine/mentry.S | 13 |
3 files changed, 0 insertions, 22 deletions
diff --git a/machine/machine.ac b/machine/machine.ac index e3033b2..a787113 100644 --- a/machine/machine.ac +++ b/machine/machine.ac @@ -4,7 +4,3 @@ AC_ARG_ENABLE([fp-emulation], AS_HELP_STRING([--disable-fp-emulation], [Disable AS_IF([test "x$enable_fp_emulation" != "xno"], [ AC_DEFINE([PK_ENABLE_FP_EMULATION],,[Define if floating-point emulation is enabled]) ]) - -AC_ARG_WITH([dts], AS_HELP_STRING([--with-dts], [Support a machine dts]), - [AC_SUBST([MACHINE_DTS], $with_dts, [machine dts])] -) diff --git a/machine/machine.mk.in b/machine/machine.mk.in index c7075fb..dcecb7a 100644 --- a/machine/machine.mk.in +++ b/machine/machine.mk.in @@ -37,8 +37,3 @@ machine_c_srcs = \ machine_asm_srcs = \ mentry.S \ fp_asm.S \ - -mentry.o: machine.dtb - -machine.dtb: $(MACHINE_DTS) - dtc -O dtb $^ -o $@
\ No newline at end of file diff --git a/machine/mentry.S b/machine/mentry.S index e619812..9ec9916 100644 --- a/machine/mentry.S +++ b/machine/mentry.S @@ -281,10 +281,6 @@ do_reset: #endif # Boot on the first hart -#ifdef MACHINE_DTS - csrr a0, mhartid - la a1, dtb_start -#endif j init_first_hart .LmultiHartInit: @@ -317,15 +313,6 @@ do_reset: wfi j .LmultiHart -#ifdef MACHINE_DTS -.section .dtb -.align 3 -.global dtb_start, dtb_end -dtb_start: -.incbin "machine.dtb" -dtb_end: -#endif - .bss .align RISCV_PGSHIFT stacks: |