Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

cleanup headers #313

Merged
merged 2 commits into from
Feb 7, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion hal/armv7a/imx6ull/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
#include "imx6ull.h"
#include "../cpu.h"

#include <phoenix/arch/syspage-imx6ull.h>
#include <phoenix/arch/armv7a/imx6ull/syspage.h>
#include <phoenix/syspage.h>

#define PATH_KERNEL "phoenix-armv7a7-imx6ull.elf"
Expand Down
2 changes: 1 addition & 1 deletion hal/armv7a/zynq7000/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
#include "types.h"
#include "peripherals.h"

#include <phoenix/arch/syspage-zynq7000.h>
#include <phoenix/arch/armv7a/zynq7000/syspage.h>

Check failure on line 26 in hal/armv7a/zynq7000/config.h

View workflow job for this annotation

GitHub Actions / call-ci / build (armv7a9-zynq7000-zedboard)

phoenix/arch/armv7a/zynq7000/syspage.h: No such file or directory

Check failure on line 26 in hal/armv7a/zynq7000/config.h

View workflow job for this annotation

GitHub Actions / call-ci / build (armv7a9-zynq7000-zedboard)

phoenix/arch/armv7a/zynq7000/syspage.h: No such file or directory

Check failure on line 26 in hal/armv7a/zynq7000/config.h

View workflow job for this annotation

GitHub Actions / call-ci / build (armv7a9-zynq7000-zedboard)

phoenix/arch/armv7a/zynq7000/syspage.h: No such file or directory

Check failure on line 26 in hal/armv7a/zynq7000/config.h

View workflow job for this annotation

GitHub Actions / call-ci / build (armv7a9-zynq7000-zedboard)

phoenix/arch/armv7a/zynq7000/syspage.h: No such file or directory

Check failure on line 26 in hal/armv7a/zynq7000/config.h

View workflow job for this annotation

GitHub Actions / call-ci / build (armv7a9-zynq7000-zedboard)

phoenix/arch/armv7a/zynq7000/syspage.h: No such file or directory

Check failure on line 26 in hal/armv7a/zynq7000/config.h

View workflow job for this annotation

GitHub Actions / call-ci / build (armv7a9-zynq7000-zedboard)

phoenix/arch/armv7a/zynq7000/syspage.h: No such file or directory

Check failure on line 26 in hal/armv7a/zynq7000/config.h

View workflow job for this annotation

GitHub Actions / call-ci / build (armv7a9-zynq7000-zturn)

phoenix/arch/armv7a/zynq7000/syspage.h: No such file or directory

Check failure on line 26 in hal/armv7a/zynq7000/config.h

View workflow job for this annotation

GitHub Actions / call-ci / build (armv7a9-zynq7000-zturn)

phoenix/arch/armv7a/zynq7000/syspage.h: No such file or directory

Check failure on line 26 in hal/armv7a/zynq7000/config.h

View workflow job for this annotation

GitHub Actions / call-ci / build (armv7a9-zynq7000-zturn)

phoenix/arch/armv7a/zynq7000/syspage.h: No such file or directory

Check failure on line 26 in hal/armv7a/zynq7000/config.h

View workflow job for this annotation

GitHub Actions / call-ci / build (armv7a9-zynq7000-zturn)

phoenix/arch/armv7a/zynq7000/syspage.h: No such file or directory

Check failure on line 26 in hal/armv7a/zynq7000/config.h

View workflow job for this annotation

GitHub Actions / call-ci / build (armv7a9-zynq7000-zturn)

phoenix/arch/armv7a/zynq7000/syspage.h: No such file or directory

Check failure on line 26 in hal/armv7a/zynq7000/config.h

View workflow job for this annotation

GitHub Actions / call-ci / build (armv7a9-zynq7000-zturn)

phoenix/arch/armv7a/zynq7000/syspage.h: No such file or directory
#include <phoenix/syspage.h>

#include "../cpu.h"
Expand Down
2 changes: 1 addition & 1 deletion hal/armv7m/imxrt/10xx/105x/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@

#include "../../types.h"

#include <phoenix/arch/syspage-imxrt.h>
#include <phoenix/arch/armv7m/imxrt/syspage.h>
#include <phoenix/syspage.h>

#include "../../../cpu.h"
Expand Down
2 changes: 1 addition & 1 deletion hal/armv7m/imxrt/10xx/106x/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@

#include "../../types.h"

#include <phoenix/arch/syspage-imxrt.h>
#include <phoenix/arch/armv7m/imxrt/syspage.h>
#include <phoenix/syspage.h>

#include "../../../cpu.h"
Expand Down
2 changes: 1 addition & 1 deletion hal/armv7m/imxrt/117x/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@

#include "../types.h"

#include <phoenix/arch/syspage-imxrt.h>
#include <phoenix/arch/armv7m/imxrt/syspage.h>
#include <phoenix/syspage.h>

#include "../../cpu.h"
Expand Down
2 changes: 1 addition & 1 deletion hal/armv7m/stm32/l4/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
#include "peripherals.h"
#include "../types.h"

#include <phoenix/arch/syspage-stm32.h>
#include <phoenix/arch/armv7m/stm32/syspage.h>
#include <phoenix/syspage.h>

#include "../../cpu.h"
Expand Down
2 changes: 1 addition & 1 deletion hal/armv8m/nrf/91/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
#include "peripherals.h"
#include "../types.h"

#include <phoenix/arch/syspage-nrf91.h>
#include <phoenix/arch/armv8m/nrf/syspage.h>
#include <phoenix/syspage.h>

#include "../../cpu.h"
Expand Down
2 changes: 1 addition & 1 deletion hal/ia32/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
#include "peripherals.h"
#include "types.h"

#include <phoenix/arch/syspage-ia32.h>
#include <phoenix/arch/ia32/syspage.h>
#include <phoenix/syspage.h>


Expand Down
1 change: 0 additions & 1 deletion hal/ia32/efi/kernel/cpu.h
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,6 @@ typedef u32 addr_t;
typedef u64 cycles_t;

typedef u64 usec_t;
typedef s64 offs_t;

typedef unsigned int size_t;
typedef unsigned long long time_t;
Expand Down
2 changes: 1 addition & 1 deletion hal/riscv64/generic/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
#include "hal/riscv64/sbi.h"
#include "hal/riscv64/dtb.h"

#include <phoenix/arch/syspage-riscv64.h>
#include <phoenix/arch/riscv64/syspage.h>

Check failure on line 29 in hal/riscv64/generic/config.h

View workflow job for this annotation

GitHub Actions / call-ci / build (riscv64-generic-spike)

phoenix/arch/riscv64/syspage.h: No such file or directory

Check failure on line 29 in hal/riscv64/generic/config.h

View workflow job for this annotation

GitHub Actions / call-ci / build (riscv64-generic-spike)

phoenix/arch/riscv64/syspage.h: No such file or directory

Check failure on line 29 in hal/riscv64/generic/config.h

View workflow job for this annotation

GitHub Actions / call-ci / build (riscv64-generic-spike)

phoenix/arch/riscv64/syspage.h: No such file or directory

Check failure on line 29 in hal/riscv64/generic/config.h

View workflow job for this annotation

GitHub Actions / call-ci / build (riscv64-generic-spike)

phoenix/arch/riscv64/syspage.h: No such file or directory
#include <phoenix/syspage.h>

#define PATH_KERNEL "phoenix-riscv64-generic.elf"
Expand Down
2 changes: 1 addition & 1 deletion hal/sparcv8leon3/gaisler/gr712rc/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
#include "../types.h"
#include "../../cpu.h"

#include <phoenix/arch/syspage-sparcv8leon3.h>
#include <phoenix/arch/sparcv8leon3/syspage.h>
#include <phoenix/syspage.h>

#define PATH_KERNEL "phoenix-sparcv8leon3-gr712rc.elf"
Expand Down
2 changes: 1 addition & 1 deletion hal/sparcv8leon3/gaisler/gr716/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
#include "../gaisler.h"
#include "../../cpu.h"

#include <phoenix/arch/syspage-sparcv8leon3.h>
#include <phoenix/arch/sparcv8leon3/syspage.h>
#include <phoenix/syspage.h>

#include <devices/gpio-gr716/gpio.h>
Expand Down
Loading