This is an automated email from the ASF dual-hosted git repository.
jerpelea pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx.git
commit 181a31801d7132249e1df53875ec6317ab20c77c
Author: chao an <anc...@lixiang.com>
AuthorDate: Thu Jan 11 12:46:42 2024 +0800
arm/armv8r: remove unused serial_pl011.h
Signed-off-by: chao an <anc...@lixiang.com>
---
arch/arm/src/fvp-v8r-aarch32/fvp_boot.c | 3 +-
arch/arm/src/fvp-v8r-aarch32/serial_pl011.h | 53 -----------------------------
arch/arm64/src/fvp-v8r/fvp_boot.c | 3 +-
arch/arm64/src/fvp-v8r/fvp_lowputc.S | 1 -
arch/arm64/src/fvp-v8r/serial_pl011.h | 53 -----------------------------
5 files changed, 4 insertions(+), 109 deletions(-)
diff --git a/arch/arm/src/fvp-v8r-aarch32/fvp_boot.c
b/arch/arm/src/fvp-v8r-aarch32/fvp_boot.c
index a410a3b24f..f48f8d9440 100644
--- a/arch/arm/src/fvp-v8r-aarch32/fvp_boot.c
+++ b/arch/arm/src/fvp-v8r-aarch32/fvp_boot.c
@@ -37,7 +37,8 @@
#include "arm_gic.h"
#include "chip.h"
#include "fvp_boot.h"
-#include "serial_pl011.h"
+
+#include <nuttx/serial/uart_pl011.h>
/****************************************************************************
* Private Data
diff --git a/arch/arm/src/fvp-v8r-aarch32/serial_pl011.h
b/arch/arm/src/fvp-v8r-aarch32/serial_pl011.h
deleted file mode 100644
index 1c91902a28..0000000000
--- a/arch/arm/src/fvp-v8r-aarch32/serial_pl011.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/****************************************************************************
- * arch/arm/src/fvp-v8r-aarch32/serial_pl011.h
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership. The
- * ASF licenses this file to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the
- * License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- ****************************************************************************/
-
-#ifndef __ARCH_ARM_SRC_FVP_V8R_SERIAL_PL011_H
-#define __ARCH_ARM_SRC_FVP_V8R_SERIAL_PL011_H
-
-/****************************************************************************
- * Included Files
- ****************************************************************************/
-
-#include <nuttx/config.h>
-
-/****************************************************************************
- * Pre-processor Definitions
- ****************************************************************************/
-
-/****************************************************************************
- * Public Types
- ****************************************************************************/
-
-/****************************************************************************
- * Inline Functions
- ****************************************************************************/
-
-#ifndef __ASSEMBLY__
-
-/****************************************************************************
- * Public Data
- ****************************************************************************/
-
-/****************************************************************************
- * Public Function Prototypes
- ****************************************************************************/
-
-#endif /* __ASSEMBLY__ */
-#endif /* __ARCH_ARM_SRC_FVP_V8R_SERIAL_PL011_H */
diff --git a/arch/arm64/src/fvp-v8r/fvp_boot.c
b/arch/arm64/src/fvp-v8r/fvp_boot.c
index 78f0ef6c41..255e508c13 100644
--- a/arch/arm64/src/fvp-v8r/fvp_boot.c
+++ b/arch/arm64/src/fvp-v8r/fvp_boot.c
@@ -39,7 +39,8 @@
#include "arm64_mpu.h"
#include "chip.h"
#include "fvp_boot.h"
-#include "serial_pl011.h"
+
+#include <nuttx/serial/uart_pl011.h>
/****************************************************************************
* Private Data
diff --git a/arch/arm64/src/fvp-v8r/fvp_lowputc.S
b/arch/arm64/src/fvp-v8r/fvp_lowputc.S
index 1aa6e204b1..5d1231c95a 100644
--- a/arch/arm64/src/fvp-v8r/fvp_lowputc.S
+++ b/arch/arm64/src/fvp-v8r/fvp_lowputc.S
@@ -26,7 +26,6 @@
#include <nuttx/config.h>
#include "arm64_macro.inc"
-#include "serial_pl011.h"
/****************************************************************************
* Public Symbols
diff --git a/arch/arm64/src/fvp-v8r/serial_pl011.h
b/arch/arm64/src/fvp-v8r/serial_pl011.h
deleted file mode 100644
index 39715a9741..0000000000
--- a/arch/arm64/src/fvp-v8r/serial_pl011.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/****************************************************************************
- * arch/arm64/src/fvp-v8r/serial_pl011.h
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership. The
- * ASF licenses this file to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the
- * License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- ****************************************************************************/
-
-#ifndef __ARCH_ARM64_SRC_FVP_V8R_SERIAL_PL011_H
-#define __ARCH_ARM64_SRC_FVP_V8R_SERIAL_PL011_H
-
-/****************************************************************************
- * Included Files
- ****************************************************************************/
-
-#include <nuttx/config.h>
-
-/****************************************************************************
- * Pre-processor Definitions
- ****************************************************************************/
-
-/****************************************************************************
- * Public Types
- ****************************************************************************/
-
-/****************************************************************************
- * Inline Functions
- ****************************************************************************/
-
-#ifndef __ASSEMBLY__
-
-/****************************************************************************
- * Public Data
- ****************************************************************************/
-
-/****************************************************************************
- * Public Function Prototypes
- ****************************************************************************/
-
-#endif /* __ASSEMBLY__ */
-#endif /* __ARCH_ARM64_SRC_FVP_V8R_SERIAL_PL011_H */
