From 074e40e705be4cb376924441ddd4a4234336b029 Mon Sep 17 00:00:00 2001 From: Evan Date: Sun, 17 Sep 2023 18:27:46 -0400 Subject: [PATCH 1/2] Add Base Submodule --- .gitmodules | 3 +++ Odyssey-Base | 1 + 2 files changed, 4 insertions(+) create mode 160000 Odyssey-Base diff --git a/.gitmodules b/.gitmodules index fe80be94..461897cd 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,6 @@ [submodule "odysseus/buildroot"] path = odysseus/buildroot url = git@github.com:buildroot/buildroot.git +[submodule "Odyssey-Base"] + path = Odyssey-Base + url = https://github.com/Northeastern-Electric-Racing/Odyssey-Base diff --git a/Odyssey-Base b/Odyssey-Base new file mode 160000 index 00000000..31f3e56a --- /dev/null +++ b/Odyssey-Base @@ -0,0 +1 @@ +Subproject commit 31f3e56a23da20ca0feef898b014beece20d6d66 From 090227360d6286fc7e2812146daf06dc9323598a Mon Sep 17 00:00:00 2001 From: nwdepatie Date: Sun, 17 Sep 2023 18:46:37 -0400 Subject: [PATCH 2/2] Removing odysseus subdirectory --- .gitmodules | 3 - odysseus/README.md | 30 -------- odysseus/buildroot | 1 - odysseus/odysseus_tree/Config.in | 0 .../odysseus_tree/board/tpu/busybox.config | 0 odysseus/odysseus_tree/board/tpu/linux.config | 0 .../odysseus_tree/board/tpu/post_image.sh | 0 .../odysseus_tree/board/tpu/psot_build.sh | 0 odysseus/odysseus_tree/configs/tpu_defconfig | 74 ------------------- odysseus/odysseus_tree/external.desc | 2 - odysseus/odysseus_tree/external.mk | 1 - 11 files changed, 111 deletions(-) delete mode 100644 odysseus/README.md delete mode 160000 odysseus/buildroot delete mode 100644 odysseus/odysseus_tree/Config.in delete mode 100644 odysseus/odysseus_tree/board/tpu/busybox.config delete mode 100644 odysseus/odysseus_tree/board/tpu/linux.config delete mode 100644 odysseus/odysseus_tree/board/tpu/post_image.sh delete mode 100644 odysseus/odysseus_tree/board/tpu/psot_build.sh delete mode 100644 odysseus/odysseus_tree/configs/tpu_defconfig delete mode 100644 odysseus/odysseus_tree/external.desc delete mode 100644 odysseus/odysseus_tree/external.mk diff --git a/.gitmodules b/.gitmodules index 461897cd..b68ecbb1 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,3 @@ -[submodule "odysseus/buildroot"] - path = odysseus/buildroot - url = git@github.com:buildroot/buildroot.git [submodule "Odyssey-Base"] path = Odyssey-Base url = https://github.com/Northeastern-Electric-Racing/Odyssey-Base diff --git a/odysseus/README.md b/odysseus/README.md deleted file mode 100644 index 4d2e3ec2..00000000 --- a/odysseus/README.md +++ /dev/null @@ -1,30 +0,0 @@ -# Odysseus -Custom Linux Build being used to drive the TPU - -## Setting up Docker Environment -TBD, for now build locally on Linux - -## Start Container on MacOS/Linux -In any terminal that is in the directory: - - # if need to rebuild image - docker image prune -a - sudo docker build -f ./Dockerfile -t ner-gcc-arm . - - sudo docker run --rm -it --privileged -v "$PWD:/home/app" ner-gcc-arm:latest bash - -## Initializing the Project -1. Run ```git submodule update --init``` to clone the buildroot repo locally -2. ```cd``` into the ```Odyssey/odysseus/buildroot``` directory -3. Run ```make BR2_EXTERNAL=../odysseus_tree tpu_defconfig``` - -## Configuring the Project -1. Run ```make menuconfig``` after initializing -2. Make any customizations you want in the menu -3. Save changes after you've made them by running ```make savedefconfig BR2_DEFCONFIG=../odysseus_tree/configs/tpu_defconfig``` - -## Building the Project -1. Run ```make``` (Note: this can take a few hours on first build, subsequent builds take less time) -2. Navigate to ```buildroot/output``` and flash an SD card with ```sdcard.img``` (I prefer Ubuntu's disk writer since its easy and in GUI, but can use ```dd``` or whatever you prefer) -3. Put SD card into TPU and boot it (easier to verify connected to a monitor) - diff --git a/odysseus/buildroot b/odysseus/buildroot deleted file mode 160000 index d918568a..00000000 --- a/odysseus/buildroot +++ /dev/null @@ -1 +0,0 @@ -Subproject commit d918568a15cc00a0c718a475b6c755fcdc8e0d1e diff --git a/odysseus/odysseus_tree/Config.in b/odysseus/odysseus_tree/Config.in deleted file mode 100644 index e69de29b..00000000 diff --git a/odysseus/odysseus_tree/board/tpu/busybox.config b/odysseus/odysseus_tree/board/tpu/busybox.config deleted file mode 100644 index e69de29b..00000000 diff --git a/odysseus/odysseus_tree/board/tpu/linux.config b/odysseus/odysseus_tree/board/tpu/linux.config deleted file mode 100644 index e69de29b..00000000 diff --git a/odysseus/odysseus_tree/board/tpu/post_image.sh b/odysseus/odysseus_tree/board/tpu/post_image.sh deleted file mode 100644 index e69de29b..00000000 diff --git a/odysseus/odysseus_tree/board/tpu/psot_build.sh b/odysseus/odysseus_tree/board/tpu/psot_build.sh deleted file mode 100644 index e69de29b..00000000 diff --git a/odysseus/odysseus_tree/configs/tpu_defconfig b/odysseus/odysseus_tree/configs/tpu_defconfig deleted file mode 100644 index af5b657c..00000000 --- a/odysseus/odysseus_tree/configs/tpu_defconfig +++ /dev/null @@ -1,74 +0,0 @@ -BR2_aarch64=y -BR2_ARM_FPU_VFPV4=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y -BR2_TOOLCHAIN_BUILDROOT_CXX=y -BR2_TARGET_GENERIC_HOSTNAME="odyssey" -BR2_TARGET_GENERIC_ISSUE="Welcome to Odyssey" -BR2_TARGET_GENERIC_ROOT_PASSWD="ner" -BR2_SYSTEM_BIN_SH_ZSH=y -BR2_SYSTEM_DHCP="eth0" -BR2_ROOTFS_POST_BUILD_SCRIPT="board/raspberrypi3-64/post-build.sh" -BR2_ROOTFS_POST_IMAGE_SCRIPT="board/raspberrypi3-64/post-image.sh" -BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,0b54dbda3cca2beb51e236a25738784e90853b64)/linux-0b54dbda3cca2beb51e236a25738784e90853b64.tar.gz" -BR2_LINUX_KERNEL_DEFCONFIG="bcmrpi3" -BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="broadcom/bcm2710-rpi-3-b broadcom/bcm2710-rpi-3-b-plus broadcom/bcm2837-rpi-3-b" -BR2_LINUX_KERNEL_INSTALL_TARGET=y -BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y -BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y -BR2_PACKAGE_GZIP=y -BR2_PACKAGE_XZ=y -BR2_PACKAGE_GDB=y -BR2_PACKAGE_GDB_DEBUGGER=y -BR2_PACKAGE_STRESS=y -BR2_PACKAGE_GREP=y -BR2_PACKAGE_BTRFS_PROGS=y -BR2_PACKAGE_FIRMWARE_UTILS=y -BR2_PACKAGE_FUSE_OVERLAYFS=y -BR2_PACKAGE_RPI_FIRMWARE=y -BR2_PACKAGE_RPI_FIRMWARE_BOOTCODE_BIN=y -BR2_PACKAGE_RPI_FIRMWARE_VARIANT_PI=y -BR2_PACKAGE_RPI_FIRMWARE_CONFIG_FILE="board/raspberrypi3-64/config_3_64bit.txt" -BR2_PACKAGE_MDIO_TOOLS=y -BR2_PACKAGE_MINICOM=y -BR2_PACKAGE_OPENOCD=y -BR2_PACKAGE_PERL=y -BR2_PACKAGE_PYTHON3=y -BR2_PACKAGE_LIBCURL=y -BR2_PACKAGE_LIBCURL_CURL=y -BR2_PACKAGE_LIBWEBSOCK=y -BR2_PACKAGE_LIBWEBSOCKETS=y -BR2_PACKAGE_PROTOBUF=y -BR2_PACKAGE_PROTOBUF_C=y -BR2_PACKAGE_ARP_SCAN=y -BR2_PACKAGE_CAN_UTILS=y -BR2_PACKAGE_DHCP=y -BR2_PACKAGE_DHCP_SERVER=y -BR2_PACKAGE_DHCP_CLIENT=y -BR2_PACKAGE_DHCPCD=y -BR2_PACKAGE_DNSMASQ=y -BR2_PACKAGE_DROPBEAR=y -BR2_PACKAGE_IPERF3=y -BR2_PACKAGE_IW=y -BR2_PACKAGE_IWD=y -BR2_PACKAGE_NMAP=y -BR2_PACKAGE_NTP=y -BR2_PACKAGE_NTP_NTPDATE=y -BR2_PACKAGE_NTP_NTPTIME=y -BR2_PACKAGE_DOCKER_CLI=y -BR2_PACKAGE_DOCKER_ENGINE=y -BR2_PACKAGE_HTOP=y -BR2_PACKAGE_KMOD=y -BR2_PACKAGE_KMOD_TOOLS=y -BR2_PACKAGE_NANO=y -BR2_PACKAGE_UEMACS=y -BR2_PACKAGE_VIM=y -BR2_TARGET_ROOTFS_EXT2=y -BR2_TARGET_ROOTFS_EXT2_4=y -BR2_TARGET_ROOTFS_EXT2_SIZE="500M" -# BR2_TARGET_ROOTFS_TAR is not set -BR2_PACKAGE_HOST_DOSFSTOOLS=y -BR2_PACKAGE_HOST_GENIMAGE=y -BR2_PACKAGE_HOST_MTOOLS=y diff --git a/odysseus/odysseus_tree/external.desc b/odysseus/odysseus_tree/external.desc deleted file mode 100644 index d2fa6e75..00000000 --- a/odysseus/odysseus_tree/external.desc +++ /dev/null @@ -1,2 +0,0 @@ -name: tpu_tree -desc: External tree used for configuring odysseus diff --git a/odysseus/odysseus_tree/external.mk b/odysseus/odysseus_tree/external.mk deleted file mode 100644 index 3b7d0e78..00000000 --- a/odysseus/odysseus_tree/external.mk +++ /dev/null @@ -1 +0,0 @@ -include $(sort $(wildcard $(BR2_EXTERNAL_BAR_42_PATH)/package/*/*.mk))