This is an automated email from the ASF dual-hosted git repository. janc pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/mynewt-nimble.git
commit 605ade16f7793e6c691b73436538ac588d7d0754 Author: Szymon Janc <[email protected]> AuthorDate: Thu Dec 23 14:26:36 2021 +0100 nimble/ports: Use native BSP for test targets Dummy BSP could be getting out of sync with Mynewt BSP leading to compile errors. --- porting/targets/dummy_bsp/bsp.yml | 56 ----------------------------- porting/targets/dummy_bsp/include/bsp/bsp.h | 31 ---------------- porting/targets/dummy_bsp/pkg.yml | 27 -------------- porting/targets/linux/target.yml | 2 +- porting/targets/linux_blemesh/target.yml | 2 +- porting/targets/nuttx/target.yml | 2 +- porting/targets/porting_default/syscfg.yml | 3 ++ porting/targets/porting_default/target.yml | 2 +- 8 files changed, 7 insertions(+), 118 deletions(-) diff --git a/porting/targets/dummy_bsp/bsp.yml b/porting/targets/dummy_bsp/bsp.yml deleted file mode 100644 index ecd1d42..0000000 --- a/porting/targets/dummy_bsp/bsp.yml +++ /dev/null @@ -1,56 +0,0 @@ -# -# 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. -# - -bsp.name: "dummy" -bsp.url: -bsp.maker: -bsp.arch: dummy -bsp.compiler: "@apache-mynewt-core/compiler/sim" - -bsp.flash_map: - areas: - # System areas. - FLASH_AREA_BOOTLOADER: - device: 0 - offset: 0x00000000 - size: 32kB - FLASH_AREA_IMAGE_0: - device: 0 - offset: 0x0000c000 - size: 472kB - FLASH_AREA_IMAGE_1: - device: 0 - offset: 0x00082000 - size: 472kB - FLASH_AREA_IMAGE_SCRATCH: - device: 0 - offset: 0x000f8000 - size: 16kB - - # User areas. - FLASH_AREA_REBOOT_LOG: - user_id: 0 - device: 0 - offset: 0x00008000 - size: 16kB - FLASH_AREA_NFFS: - user_id: 1 - device: 0 - offset: 0x000fc000 - size: 16kB diff --git a/porting/targets/dummy_bsp/include/bsp/bsp.h b/porting/targets/dummy_bsp/include/bsp/bsp.h deleted file mode 100644 index 69e8b1c..0000000 --- a/porting/targets/dummy_bsp/include/bsp/bsp.h +++ /dev/null @@ -1,31 +0,0 @@ -/* - * 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 H_BSP_H -#define H_BSP_H - -#ifdef __cplusplus -extern "C" { -#endif - -#ifdef __cplusplus -} -#endif - -#endif /* H_BSP_H */ diff --git a/porting/targets/dummy_bsp/pkg.yml b/porting/targets/dummy_bsp/pkg.yml deleted file mode 100644 index 8b84849..0000000 --- a/porting/targets/dummy_bsp/pkg.yml +++ /dev/null @@ -1,27 +0,0 @@ -# -# 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. -# - -pkg.name: porting/targets/dummy_bsp -pkg.type: bsp -pkg.description: A dummy BSP definition -pkg.author: "Apache Mynewt <[email protected]>" -pkg.homepage: "http://mynewt.apache.org/"; -pkg.keywords: -pkg.cflags: -pkg.deps: diff --git a/porting/targets/linux/target.yml b/porting/targets/linux/target.yml index 9ab4152..7145d70 100644 --- a/porting/targets/linux/target.yml +++ b/porting/targets/linux/target.yml @@ -16,5 +16,5 @@ # under the License. # target.app: "porting/targets/dummy_app" -target.bsp: "porting/targets/dummy_bsp" +target.bsp: "@apache-mynewt-core/hw/bsp/native" target.build_profile: "debug" diff --git a/porting/targets/linux_blemesh/target.yml b/porting/targets/linux_blemesh/target.yml index 83eb415..4b9a4da 100644 --- a/porting/targets/linux_blemesh/target.yml +++ b/porting/targets/linux_blemesh/target.yml @@ -17,5 +17,5 @@ # target.app: "porting/targets/dummy_app" -target.bsp: "porting/targets/dummy_bsp" +target.bsp: "@apache-mynewt-core/hw/bsp/native" target.build_profile: "debug" diff --git a/porting/targets/nuttx/target.yml b/porting/targets/nuttx/target.yml index 9ab4152..7145d70 100644 --- a/porting/targets/nuttx/target.yml +++ b/porting/targets/nuttx/target.yml @@ -16,5 +16,5 @@ # under the License. # target.app: "porting/targets/dummy_app" -target.bsp: "porting/targets/dummy_bsp" +target.bsp: "@apache-mynewt-core/hw/bsp/native" target.build_profile: "debug" diff --git a/porting/targets/porting_default/syscfg.yml b/porting/targets/porting_default/syscfg.yml new file mode 100644 index 0000000..d0aff80 --- /dev/null +++ b/porting/targets/porting_default/syscfg.yml @@ -0,0 +1,3 @@ +syscfg.vals: + BLE_SOCK_USE_TCP: 0 + BLE_SOCK_USE_LINUX_BLUE: 1 diff --git a/porting/targets/porting_default/target.yml b/porting/targets/porting_default/target.yml index 83eb415..4b9a4da 100644 --- a/porting/targets/porting_default/target.yml +++ b/porting/targets/porting_default/target.yml @@ -17,5 +17,5 @@ # target.app: "porting/targets/dummy_app" -target.bsp: "porting/targets/dummy_bsp" +target.bsp: "@apache-mynewt-core/hw/bsp/native" target.build_profile: "debug"
