Skip to content

Commit

Permalink
Revert "Merge branch 'development' into cc-kernel-dev"
Browse files Browse the repository at this point in the history
This reverts commit 2e22bb3, reversing
changes made to d68cfc7.
  • Loading branch information
akashkollipara committed Jan 12, 2022
1 parent 39644a0 commit 71f092e
Show file tree
Hide file tree
Showing 40 changed files with 49 additions and 1,303 deletions.
16 changes: 8 additions & 8 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,25 +21,25 @@ Click the above icon to connect

| Atmel | SiFive | STMicro | TI | Raspberry Pi |
| ---------- | ----------- | ----------- | ----------- | -------------|
| ATMega328P | FE310-G002 | Coming soon | Coming soon | Coming soon |
| ATMega328P | Coming soon | Coming soon | Coming soon | Coming soon |
| ATMega2560 | | | | |

### Projects
run
```
$ make list
```
* demo_avr
* demo_avr_cpp
* demo_avr_bit_banding

### Programming Languages
* asm/assembly
* C/C++
* C
* Cpp/C++
* makefile
* linker script

### Help
run
```
$ make help
make help
```

For details about the framework, follow the README.md in each folder.
Expand All @@ -54,4 +54,4 @@ Host system requirements:
Toolchain Requirements:
* Please push your toolchains to your git repo
* Update the links in mk/tc_get.mk file
* run ```$ make help``` for more details
* run ```make help``` for more details
3 changes: 0 additions & 3 deletions jenkins.pipe
Original file line number Diff line number Diff line change
Expand Up @@ -5,21 +5,18 @@ pipeline {
stage('tc check') {
steps {
sh 'make get_avr_tc [email protected]:VisorFolks/avr-toolchain.git'
sh 'make get_riscv_tc [email protected]:VisorFolks/risc-v-toolchain.git'
}
}
stage('check') {
steps {
sh 'make demo_avr check'
sh 'make demo_avr_cpp check'
sh 'make demo_riscv check'
}
}
stage('build') {
steps {
sh 'make demo_avr clean default'
sh 'make demo_avr_cpp clean default'
sh 'make demo_riscv clean default'
}
}
stage('clean') {
Expand Down
16 changes: 0 additions & 16 deletions mk/copy_to_remote.mk

This file was deleted.

2 changes: 0 additions & 2 deletions mk/elf.mk
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,7 @@ $(ELF): $(DEP_LIBS) $(DEP_OBJS) $(LD_SCRIPT) $(LD_SUPPLEMENT)
@cd $(@D); $(SIZE) $(@F)
@echo ""

.SECONDEXPANSION:
$(OUT)/%.ld: %.ld.sx
mkdir -p $(@D)
@echo "Elf: Preprocessing $(@F) ..."
$(CC) $(CFLAGS) -E -P -o $@ $<

20 changes: 10 additions & 10 deletions mk/project.mk
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,7 @@
include mk/path.mk
include mk/mk_helper.mk

P_TARGETS += default cyancore check version copy_to_remote clean_remote
T_ALLOWLIST += help list clean
T_ALLOWLIST += help list

.PHONY: aux_target

Expand All @@ -37,12 +36,11 @@ list:

check: --lint

copy_to_remote: --cpremote
clean_remote: --rmremote


ifeq ($(findstring $(MAKECMDGOALS),$(T_ALLOWLIST)),)
ifeq ($(findstring $(firstword $(MAKECMDGOALS)),$(P_TARGETS)),)
ifneq ($(firstword $(MAKECMDGOALS)),clean)
ifneq ($(firstword $(MAKECMDGOALS)),default)
ifneq ($(firstword $(MAKECMDGOALS)),cyancore)
ifneq ($(firstword $(MAKECMDGOALS)),check)
PROJECT ?= $(firstword $(MAKECMDGOALS))
CMD := $(word 2,$(MAKECMDGOALS))
ifeq ($(CMD),)
Expand All @@ -52,6 +50,9 @@ endif
.PHONY: $(PROJECT)
$(PROJECT): $(CMD)

endif
endif
endif
endif

ifeq ($(PROJECT),)
Expand All @@ -63,15 +64,14 @@ $(info < x > Invalid project name...)
$(info < ! > Run `make list` to get list of projects)
$(error < x > Build Failed!)
endif
endif

ifeq ($(findstring $(MAKECMDGOALS),$(T_ALLOWLIST)),)
include $(SRC)/sources.mk
include mk/tc.mk
include mk/copy_to_remote.mk
endif
endif

ifeq ($(findstring $(CMD),$(T_ALLOWLIST) $(P_TARGETS)),)
ifeq ($(findstring $(CMD),$(T_ALLOWLIST) default clean cyancore),)
$(CMD): $(filter %/$(CMD),$(DEP_LIBS) $(DEP_OBJS))
if [ "$<" = "" ]; then \
echo "No such target: $@"; \
Expand Down
14 changes: 1 addition & 13 deletions mk/usage_help.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@
Usage : make <option> <command>
option : {list | get_all_tc | get_arm_tc | get_avr_tv |
get_riscv_tc | help} or <Project Name>
command : default (implicit) | clean | check | cyancore |
copy_to_remote clean_remote
command : default (implicit) | clean
----------------------------------------------------------
> Project Name:
* The project name is the name of directory under
Expand All @@ -21,15 +20,4 @@ command : default (implicit) | clean | check | cyancore |
* This option fetches AVR-8 toolchain.
> get_riscv_tc:
* This option fetched RISC-V toolchain.

> cyancore (avoid if not needed):
* This command builds the project with 1 thread
> check:
* This command performs cppcheck on code base for
the project.
> copy_to_remote:
* This command copies the bin, elf and hex to remote
machine.
> clean_remote:
* This command removes folders from remote machine.
==========================================================
2 changes: 0 additions & 2 deletions src/arch/avr/8/common_5x_6/terravisor/arch.c
Original file line number Diff line number Diff line change
Expand Up @@ -102,8 +102,6 @@ void (*mcall)(unsigned int, unsigned int, unsigned int, unsigned int, mret_t *);
*/
void arch_machine_call(unsigned int code, unsigned int a0, unsigned int a1, unsigned int a2, mret_t *ret)
{
if(ret == NULL)
return;
mcall(code, a0, a1, a2, ret);
return;
}
25 changes: 25 additions & 0 deletions src/arch/avr/8/common_5x_6/terravisor/include/arch.h
Original file line number Diff line number Diff line change
Expand Up @@ -89,3 +89,28 @@ static inline void arch_nop()
{
asm volatile("nop");
}

static inline void arch_sync()
{
arch_nop();
}

static inline void arch_msb()
{
arch_nop();
}

static inline void arch_isb()
{
arch_nop();
}

static inline void arch_dsb()
{
arch_nop();
}

static inline void arch_wfe()
{
arch_nop();
}
14 changes: 0 additions & 14 deletions src/arch/riscv/32/a/build.mk

This file was deleted.

35 changes: 0 additions & 35 deletions src/arch/riscv/32/a/spinlock.c

This file was deleted.

91 changes: 0 additions & 91 deletions src/arch/riscv/32/i/terravisor/arch.c

This file was deleted.

Loading

0 comments on commit 71f092e

Please sign in to comment.