From fc50c930d93fc05d926ace6a57bdc28527dfff51 Mon Sep 17 00:00:00 2001
From: Matt Harlum <matt@harlum.net>
Date: Sat, 15 Apr 2023 04:56:00 +0000
Subject: [PATCH] Switch from Prototype Autoconfig ID to OAHR Manufacturer

---
 RTL/Makefile     | 6 ++----
 RTL/autoconfig.v | 7 +++----
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/RTL/Makefile b/RTL/Makefile
index 88ad070..5ea47d6 100644
--- a/RTL/Makefile
+++ b/RTL/Makefile
@@ -1,11 +1,9 @@
 PROJECT=GottaGoFaZt3r
 PART=XC95144XL-10-TQ100
 WORKDIR=tmp
-#SERIAL=$(shell git rev-parse --short=8 HEAD)
-# Serial numbers currently causing issues with boards.library
+SERIAL=$(shell git rev-parse --short=8 HEAD)
 SERIAL=0
-PRODID=72
-DEFINES=makedefines autoconfig SERIAL=32'h${SERIAL} PRODID=${PRODID}
+DEFINES=makedefines autoconfig SERIAL=32'h${SERIAL}
 CABLE=usb21
 
 CPLDFITFLAGS=-loc on -slew slow -init low -terminate keeper -unused ground -power std -optimize speed -keepio
diff --git a/RTL/autoconfig.v b/RTL/autoconfig.v
index 47f8b81..18fb363 100644
--- a/RTL/autoconfig.v
+++ b/RTL/autoconfig.v
@@ -29,12 +29,11 @@ module Autoconfig (
 `include "globalparams.vh"
 
 `ifndef makedefines
-`define SERIAL 32'd421
-`define PRODID 8'h72
+`define SERIAL 32'd0
 `endif
 
-localparam [15:0] mfg_id  = 16'h07DB;
-localparam [7:0]  prod_id = `PRODID;
+localparam [15:0] mfg_id  = 16'd5194; // Open Amiga hardware registry ID https://github.com/oahr/oahr
+localparam [7:0]  prod_id = 8'h03;
 localparam [31:0] serial  = `SERIAL;
 
 // Register Config in/out at end of bus cycle