From f2b7abfdb9d02996299e7c4f475ddf3fae658020 Mon Sep 17 00:00:00 2001
From: FeralChild64 <you@example.com>
Date: Fri, 23 Oct 2020 16:59:36 +0200
Subject: [PATCH] small cleanup

---
 src/,,config_generic_crt.s        |  2 +-
 src/aliases/,aliases_config.s     | 10 ++++------
 src/basic/assets/startup_banner.s |  8 +++++---
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/,,config_generic_crt.s b/src/,,config_generic_crt.s
index 1e9a6970..045a4632 100644
--- a/src/,,config_generic_crt.s
+++ b/src/,,config_generic_crt.s
@@ -16,7 +16,7 @@
 
 ;; #CONFIG# PLATFORM_COMMODORE_64      YES
 ;; #CONFIG# ROM_CRT                    YES
-;; #CONFIG# BRAND_GENERIC_CRT          YES
+;; #CONFIG# BRAND_GENERIC              YES
 
 
 ; --- Processor instruction set
diff --git a/src/aliases/,aliases_config.s b/src/aliases/,aliases_config.s
index 54444095..de9bbbeb 100644
--- a/src/aliases/,aliases_config.s
+++ b/src/aliases/,aliases_config.s
@@ -39,7 +39,6 @@
 !set counter = 0
 !ifdef CONFIG_BRAND_CUSTOM       { !set counter = counter + 1 }
 !ifdef CONFIG_BRAND_GENERIC      { !set counter = counter + 1 }
-!ifdef CONFIG_BRAND_GENERIC_CRT  { !set counter = counter + 1 }
 !ifdef CONFIG_BRAND_TESTING      { !set counter = counter + 1 }
 
 !ifndef CONFIG_PLATFORM_COMMODORE_64 {
@@ -52,15 +51,14 @@
 	!error "Please select exactly one CONFIG_BRAND_* option"	
 }
 
-!ifdef CONFIG_BRAND_GENERIC_CRT { !ifndef ROM_LAYOUT_CRT {
-	!error "CONFIG_BRAND_GENERIC_CRT needs cartridge extended ROM set and vice-versa"
+!ifdef CONFIG_ROM_CRT { !ifndef ROM_LAYOUT_CRT {
+	!error "ROM_LAYOUT_CRT needs standard CONFIG_ROM_CRT set and vice-versa"
 }}
-!ifdef CONFIG_BRAND_GENERIC { !ifndef ROM_LAYOUT_STD {
-	!error "CONFIG_BRAND_GENERIC needs standard ROM set and vice-versa"
+!ifdef ROM_LAYOUT_CRT { !ifndef CONFIG_ROM_CRT {
+	!error "ROM_LAYOUT_CRT needs standard CONFIG_ROM_CRT set and vice-versa"
 }}
 
 
-
 ; Check that processor configuration is correct
 
 !set counter = 0
diff --git a/src/basic/assets/startup_banner.s b/src/basic/assets/startup_banner.s
index 2340c4c4..b1c0f552 100644
--- a/src/basic/assets/startup_banner.s
+++ b/src/basic/assets/startup_banner.s
@@ -14,9 +14,11 @@
 	!pet "open roms "
 	+CONFIG_BRAND_CUSTOM
 } else ifdef CONFIG_BRAND_GENERIC {
-	!pet "open roms generic build"
-} else ifdef CONFIG_BRAND_GENERIC_CRT {
-	!pet "open roms crt generic build"
+	!ifdef CONFIG_ROM_CRT {
+	    !pet "open roms crt generic build"
+	} else {
+	    !pet "open roms generic build"
+    }
 } else ifdef CONFIG_BRAND_TESTING {
 	!pet "open roms testing build"
 } else ifdef CONFIG_MB_U64 {