Skip to content

Commit

Permalink
Merge pull request #147 from RICCIARDI-Adrien/rename_cortex_a_to_cort…
Browse files Browse the repository at this point in the history
…ex_a_r

Renamed cortex-a to cortex-a-r.
  • Loading branch information
jlbirccyn authored Nov 6, 2023
2 parents c2583e2 + 3d69b42 commit 9b67e18
Show file tree
Hide file tree
Showing 107 changed files with 15 additions and 12 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/build-examples.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -43,11 +43,11 @@ jobs:
path: ${{ github.workspace }}
key: ${{ env.CACHE_KEY }}
- name: Generate the code
run: ${{ env.GOIL }} --target=cortex-a/armv7/bcm2836/rpi2 --templates=../../../../../../goil/templates/ ${{ matrix.example_name }}.oil
working-directory: examples/cortex-a/armv7/bcm2836/rpi2/${{ matrix.example_name }}
run: ${{ env.GOIL }} --target=cortex-a-r/armv7/bcm2836/rpi2 --templates=../../../../../../goil/templates/ ${{ matrix.example_name }}.oil
working-directory: examples/cortex-a-r/armv7/bcm2836/rpi2/${{ matrix.example_name }}
- name: Build the code
run: ./make.py
working-directory: examples/cortex-a/armv7/bcm2836/rpi2/${{ matrix.example_name }}
working-directory: examples/cortex-a-r/armv7/bcm2836/rpi2/${{ matrix.example_name }}

avr-arduino-uno-examples:
name: Build AVR Arduino Uno examples
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ Some examples are available (check examples):
* **blink**. Blinks a LED using an alarm and a task.
* **readButton**. The example polls the button to start an alarm that activates a task to blink a LED
* **readButton_isr**. Same but the button triggers an ISR.
* Cortex A7 with bcm2836 - Raspberry Pi 2 : `cortex-a/armv7/bcm2836/rpi2`.
* Cortex A7 with bcm2836 - Raspberry Pi 2 : `cortex-a-r/armv7/bcm2836/rpi2`.
* **blink**. A first runable blink example is available. We need a bootloader and and a console. This stuff will be soon available as well. Single core for the moment.
* avr: 3 examples for Arduino Uno (ATMega328p chip) and Arduino Mega (ATMega2560 chip)
* **blink**. Blinks a LED using an alarm and a task.
Expand Down
4 changes: 4 additions & 0 deletions examples/cortex-a-r/armv7/bcm2836/rpi2/blink/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
blink/
blink_exe*
*.map
*.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ It can be launched
How to build the example:
Generates the code:
```
goil --target=cortex-a/armv7/bcm2836/rpi2 --templates=../../../../../../goil/templates/ blink.oil
goil --target=cortex-a-r/armv7/bcm2836/rpi2 --templates=../../../../../../goil/templates/ blink.oil
```

Build:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ communicate with the JTAG
2 - Configure the application with

```
goil --target=cortex-a/armv7/bcm2836/rpi2 -v --templates=../../../../goil/templates/ lonely.oil
goil --target=cortex-a-r/armv7/bcm2836/rpi2 -v --templates=../../../../goil/templates/ lonely.oil
```

3 - Upload your program into the board :
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ CPU bcm2836 {
};
*/
PLATFORM_FILES bcm2836 {
PATH = "cortex-a/armv7/bcm2836";
PATH = "cortex-a-r/armv7/bcm2836";
CFILE = "bcm2836_misc.c";
CFILE = "handlers_bcm2836.c";
CFILE = "tpl_machine_bcm2836.c";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
CPU rpi2 {

PLATFORM_FILES rpi2 {
PATH = "cortex-a/armv7/bcm2836/rpi2";
PATH = "cortex-a-r/armv7/bcm2836/rpi2";
CFILE = "rpi2_tpl_sleep.S";
CFILE = "rpi2_bootstrap_stage1.S";
CFILE = "rpi2_bootstrap_stage2.c";
Expand All @@ -17,7 +17,7 @@ CPU rpi2 {
};

PLATFORM_FILES rpi2_drivers {
PATH = "cortex-a/armv7/bcm2836/rpi2/drivers";
PATH = "cortex-a-r/armv7/bcm2836/rpi2/drivers";
CFILE = "rpi2_uart.c";
CFILE = "rpi2_timer.c";
};
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@

CPU armv7 {
PLATFORM_FILES armv7 {
PATH = "cortex-a/armv7";
PATH = "cortex-a-r/armv7";
};
};
Original file line number Diff line number Diff line change
Expand Up @@ -33,13 +33,12 @@ CPU arm_interrupt {
};

PLATFORM_FILES cortex_a {
PATH = "cortex-a";
PATH = "cortex-a-r";
CFILE = "tpl_irq.S";
CFILE = "tpl_system_call.S";
CFILE = "tpl_stacks.S";
CFILE = "tpl_trusted_fct.S";
CFILE = "tpl_vector_table.s";
CFILE = "tpl_machine_arm.c";
};

};
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 comments on commit 9b67e18

Please sign in to comment.